diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
index 049aacc61c80..2159347c0ffd 100644
--- a/app-admin/pwgen/pwgen-2.07.ebuild
+++ b/app-admin/pwgen/pwgen-2.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.07.ebuild,v 1.6 2014/11/10 13:51:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.07.ebuild,v 1.7 2014/11/11 10:37:04 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_prepare() {
diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.ebuild
index 297ff44bb737..d36e6a3bc8c5 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.13.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.ebuild,v 1.8 2014/11/10 13:51:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13.ebuild,v 1.9 2014/11/11 10:37:00 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -14,7 +14,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="!!app-crypt/heimdal
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index bfb1e06eaafb..7157de1bb9d3 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r2.ebuild,v 1.9 2014/11/04 09:21:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r2.ebuild,v 1.10 2014/11/11 10:52:16 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+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 ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-emacs/python-mode/python-mode-6.1.2.ebuild b/app-emacs/python-mode/python-mode-6.1.2.ebuild
index 6d83fc56a33f..cf7f325fdb0b 100644
--- a/app-emacs/python-mode/python-mode-6.1.2.ebuild
+++ b/app-emacs/python-mode/python-mode-6.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.1.2.ebuild,v 1.5 2014/11/10 10:54:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.1.2.ebuild,v 1.6 2014/11/11 10:47:37 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index 0ed9da57637e..9720e9cec4f8 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,2 +1,2 @@
-DIST libvirt-glib-0.1.7.tar.gz 746318 SHA256 39652c07d95f980ff30b39e0fd072e768fb85d778d65432da24b17dee9d36429 SHA512 a6e296afbee64424009119036637fe96bbd703c9209e832fbf9fe1ad82054ce39017ce4e2e0b4d59559193dee2de50d72d171701eacfebd3baccb61ff3216662 WHIRLPOOL 76dd9b033981da1034ac7e4f706dcc5c97b361a2f37a6a6d36850f0035e0dd5a1d7e0ff60ed42d4b6e8737a12e25c47866b22054eb41dad85ff5b39d85b58a4c
 DIST libvirt-glib-0.1.8.tar.gz 800459 SHA256 da0e45952dbe1d5d9fde4f845f3a10763e7fed0b1e45906a46fdb74b777aa751 SHA512 0e5a9b16c61a649d964312f9be97c1dfa5597192530e6645c8abdaf64547c8251fe0a66f3b1eebaf5361ec2cd69efe9b4824106e87180ec1a31d82a73c1240ed WHIRLPOOL 383055c5aae701ef94aba246a1a46b4a489fc80da635fa5a7d55b175dff878d9329455c71c5de3fc0dd15dca811e6e3e3575b7853dac340859fd7116a3c5d2d5
+DIST libvirt-glib-0.1.9.tar.gz 830344 SHA256 053b36260ea70d740e27fe99ac67d714d23cf93d563c3342fa00593ec185a958 SHA512 f90aff63c30758524211392f6767292e4fa042d896716866b9272cdf1169ea0fd4cacaf47f4f985d429dea4f002686cb19b1930d7882dd4c88d5d038a5ce602c WHIRLPOOL 4ecaefb9a50f43c48f1061f4422bc4e490b95c1a78a47fc85a9fc4ea7c35817ff278af799c286060166b5194c79b1a16adea48ba1831250c0f4019d731e07956
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.1.7.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.1.9.ebuild
similarity index 50%
rename from app-emulation/libvirt-glib/libvirt-glib-0.1.7.ebuild
rename to app-emulation/libvirt-glib/libvirt-glib-0.1.9.ebuild
index 0e1f98294639..ecd8d077bd40 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.1.7.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.1.7.ebuild,v 1.5 2013/08/28 11:13:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt-glib/libvirt-glib-0.1.9.ebuild,v 1.1 2014/11/11 11:57:45 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -16,26 +16,48 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+introspection python +vala"
-REQUIRED_USE="vala? ( introspection )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vala? ( introspection )
+"
 
-RDEPEND="dev-libs/libxml2:2
+# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libxml2:2
 	>=app-emulation/libvirt-0.9.10:=
-	>=dev-libs/glib-2.10:2
+	>=dev-libs/glib-2.38.0:2
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-	python? ( ${PYTHON_DEPS} )"
+	python? ( ${PYTHON_DEPS} )
+"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
+	vala? ( $(vala_depend) )
+"
 
 pkg_setup() {
-	G2CONF+="--disable-test-coverage
-		--disable-static
-		$(use_enable introspection)
-		$(use_enable vala)
-		$(use_with python)"
 	use python && python-single-r1_pkg_setup
 }
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-test-coverage \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_with python)
+}
+
+src_compile() {
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1093631
+	if use vala; then
+		MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
+}
diff --git a/app-i18n/man-pages-de/man-pages-de-1.7.ebuild b/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
index 496d7f70885e..022f5af6d8ee 100644
--- a/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-1.7.ebuild,v 1.8 2014/11/10 10:51:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-1.7.ebuild,v 1.9 2014/11/11 10:45:48 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
 
 LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
 SLOT="0"
-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"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-misc/devtodo/devtodo-0.1.20-r2.ebuild b/app-misc/devtodo/devtodo-0.1.20-r2.ebuild
index f4579e0db1d0..15b6dd5c3978 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r2.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.20-r2.ebuild,v 1.9 2014/11/04 20:18:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.20-r2.ebuild,v 1.10 2014/11/11 10:51:41 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 4af250820de6..a97435e3a727 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
-DIST tracker-1.0.4.tar.xz 6169216 SHA256 cd9d0ebb2f09b581b3da607aeca96ec770ba1548c98f541dc3428bc945ff9886 SHA512 73aaa40b1bd1be74691104946f0a3c3ba240a13a01a123a5d2cc421ee50d36369dd0c64bb0890081c05374fb6f4e3dd8ea5058239bbe5a4dd2ad9ce9418d54fd WHIRLPOOL 11d71d86440fff33cc488642450368039dfdce1005f1fde1933529e19e0140580fe63a36852067bc6e6a773a976c6a2b71cf389119d267d6f734a40e8252ceb1
 DIST tracker-1.0.5.tar.xz 6061704 SHA256 9e77f8f731f44782a1468cc6dcf7f76bc9d7d7eb462c1b34062981a9c348ef16 SHA512 d5601a1d89bd6da52750b55a742005897fc4c4bd2280a5e56c462b3542473b8172d21c1e3a57cdb3e81c3ed5ed7810510e82e601fa43723df3c41a3100f61fd7 WHIRLPOOL 1165cd8a0e29fa13fe6a0410b8f9de3d277fc032496a13d2c6bca1cd9187d5bfc829ea05380d22a3262ac966a422a8bd85a9ab0fc4d7ffc8b76bddabdd2634e8
+DIST tracker-1.0.6.tar.xz 5975264 SHA256 e351ac3c182fc740afdc651d3884f8af0a8f897948a9ecc784d91bb1f9af62f9 SHA512 687ba883513a6854e99e3adc0fc5cfd2e2fb66b38486079ed178bd7c5730def4e5a8e07de32f081b30d9ac93dca5418d5c9ba782c3f80c539b3fa05b829b4b17 WHIRLPOOL 1c289d84ce63638e4a141b34d316dfaa69df26f58ac8f72154ee30e0a0bd60c3b14255cd5d900f671dd79f46d48cf3952f13b6f2e391e4b32320aca6e540a58f
diff --git a/app-misc/tracker/tracker-1.0.4.ebuild b/app-misc/tracker/tracker-1.0.6.ebuild
similarity index 99%
rename from app-misc/tracker/tracker-1.0.4.ebuild
rename to app-misc/tracker/tracker-1.0.6.ebuild
index 43f948430c54..e74503aa37cd 100644
--- a/app-misc/tracker/tracker-1.0.4.ebuild
+++ b/app-misc/tracker/tracker-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.4.ebuild,v 1.2 2014/09/26 20:38:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.6.ebuild,v 1.1 2014/11/11 10:54:31 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/app-office/glabels/Manifest b/app-office/glabels/Manifest
index e7c4a56b651f..d1c53762c71f 100644
--- a/app-office/glabels/Manifest
+++ b/app-office/glabels/Manifest
@@ -1 +1,2 @@
 DIST glabels-3.2.0.tar.xz 3359392 SHA256 c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9 SHA512 67faab8eb9f4128b532bce55a9fab34462c008d0990ba87e4d555359bec1bb162489d4bdf5efbb86c4fcfc708c92da4d88a91dd2a85f0989c9133af6b011c3ff WHIRLPOOL f79e3d15ba32041133654fd67c7e05c4bba9e8d899344c52b503c1232ddc5cce8efcec20937c2d21d4f7fa3164a6d4c5ff8f1d9a770dea59c24fcc524b460673
+DIST glabels-3.2.1.tar.xz 3368052 SHA256 db615f653b6e78ef1209814b5e6d8d3af4f8d3444a259ddbcc0dfb279c7df855 SHA512 d68fab2697cc596d45fe19c0a4c02a7bceffcb12ff72d71aaff565c62e95afeab6c2cc5b0eb00581c992b576b7ffe81d7b7a0763be2044186ba07929de78a266 WHIRLPOOL 3c0c9d1fba0548442d19a3271f466c1cf84db361d527da4b6c00d231c56a6fb7c1c61b4015d640e805878b7774ba89920c3c4ebc19b2f3fb1049d9bef12bbbc7
diff --git a/app-office/glabels/files/glabels-3.0.1-eds-3.6.patch b/app-office/glabels/files/glabels-3.0.1-eds-3.6.patch
deleted file mode 100644
index b979dd5ad130..000000000000
--- a/app-office/glabels/files/glabels-3.0.1-eds-3.6.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 6b7d7e831e5542b6ea3c15802fa882a42399fc15 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-Date: Mon, 01 Apr 2013 08:53:59 +0000
-Subject: unbreak with evolution-data-server >= 3.6.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=685130
----
-diff --git a/src/merge-evolution.c b/src/merge-evolution.c
-index bd14483..c3c2639 100644
---- a/src/merge-evolution.c
-+++ b/src/merge-evolution.c
-@@ -29,7 +29,7 @@
- 
- #include "merge-evolution.h"
- 
--#include <libebook/e-book.h>
-+#include <libebook/libebook.h>
- #include <glib/gi18n.h>
- #include <stdio.h>
- #include <string.h>
-@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gconstpointer *a, gconstpointer *b)
- /*--------------------------------------------------------------------------*/
- /* Open merge source.                                                       */
- /*--------------------------------------------------------------------------*/
-+static EBook *
-+gl_open_system_addressbook (GError **error)
-+{
-+   ESourceRegistry *registry;
-+   EBook *book = NULL;
-+   ESource *source;
-+
-+   registry = e_source_registry_new_sync (NULL, error);
-+   if (!registry)
-+       return NULL;
-+
-+   source = e_source_registry_ref_builtin_address_book (registry);
-+   if (!source) {
-+       g_object_unref (registry);
-+       return NULL;
-+   }
-+
-+   book = e_book_new (source, error);
-+
-+   g_object_unref (source);
-+   g_object_unref (registry);
-+
-+   return book;
-+}
-+
- static void
- gl_merge_evolution_open (glMerge *merge)
- {
-@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
-                 return;
-         }
- 
--        merge_evolution->priv->book = e_book_new_system_addressbook(&error);
-+        merge_evolution->priv->book = gl_open_system_addressbook(&error);
-         if (!merge_evolution->priv->book) {
-                 g_warning ("Couldn't open addressbook.");
-                 if (error)
-                 {
--                        g_warning ("e_book_new_system_addressbook: %s", error->message);
-+                        g_warning ("gl_open_system_addressbook: %s", error->message);
-                         g_error_free (error);
-                 }
-                 e_book_query_unref(query);
-diff --git a/src/merge-vcard.c b/src/merge-vcard.c
-index da1deff..6554015 100644
---- a/src/merge-vcard.c
-+++ b/src/merge-vcard.c
-@@ -27,7 +27,7 @@
- 
- #include "merge-vcard.h"
- 
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
---
-cgit v0.9.1
diff --git a/app-office/glabels/glabels-3.2.1.ebuild b/app-office/glabels/glabels-3.2.1.ebuild
new file mode 100644
index 000000000000..f223743af621
--- /dev/null
+++ b/app-office/glabels/glabels-3.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.2.1.ebuild,v 1.1 2014/11/11 11:19:57 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Program for creating labels and business cards"
+HOMEPAGE="http://www.glabels.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="barcode eds"
+
+RDEPEND="
+	>=dev-libs/glib-2.28.2:2
+	>=x11-libs/gtk+-3.0.9:3
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/librsvg-2.32.0:2
+	>=x11-libs/cairo-1.10.0
+	>=x11-libs/pango-1.28.1
+	barcode? (
+		>=app-text/barcode-0.98
+		>=media-gfx/qrencode-3.1 )
+	eds? ( >=gnome-extra/evolution-data-server-2.30.3 )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.28
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with eds libebook) \
+		--disable-static
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.2.18.ebuild b/app-text/xapian-omega/xapian-omega-1.2.18.ebuild
index 4dc51cabb731..99ab78ae4460 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.18.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.18.ebuild,v 1.3 2014/11/03 11:02:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xapian-omega/xapian-omega-1.2.18.ebuild,v 1.4 2014/11/11 10:45:20 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/xapian-${PV}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
index 779950aba597..f0ec9b9e2859 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild,v 1.6 2014/11/10 10:55:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild,v 1.7 2014/11/11 10:50:06 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-lang/ruby/ruby-1.9.3_p550.ebuild b/dev-lang/ruby/ruby-1.9.3_p550.ebuild
index 2dccb70e708e..83e2de5e63b8 100644
--- a/dev-lang/ruby/ruby-1.9.3_p550.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p550.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p550.ebuild,v 1.7 2014/11/10 10:47:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p550.ebuild,v 1.9 2014/11/11 10:35:44 ago Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml" #libedit
 
 # libedit support is removed everywhere because of this upstream bug:
diff --git a/dev-lang/ruby/ruby-2.0.0_p594.ebuild b/dev-lang/ruby/ruby-2.0.0_p594.ebuild
index b2759bc7587b..615c9f5878ec 100644
--- a/dev-lang/ruby/ruby-2.0.0_p594.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p594.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p594.ebuild,v 1.7 2014/11/10 10:47:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p594.ebuild,v 1.9 2014/11/11 10:35:44 ago Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
 
 RDEPEND="
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
index fda375fe4eca..d3aac8b2010a 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild,v 1.10 2014/11/04 09:24:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild,v 1.11 2014/11/11 10:47:54 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 3af7d5678550..e44bef31a1c1 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,3 +1,4 @@
 DIST libgdata-0.14.3.tar.xz 1476520 SHA256 c044f2af34c1e5eba7b74d5809f6f0bc4acc7007f23c4cb7ebccf94d5058ad8a SHA512 8c4cdac5f4cb591b979d3f1585b67d5e683772440a2920d5f1e9733a21435e1dc8d86d98c70694c92219b489ef640805cd38c45b3f1823026d21229eded36ea0 WHIRLPOOL d29920886f81396311949813a469972380b23932e1aec4bcadc29655203e53b4ddb074b901da313b356c5c4be124ac6008317696252c4fb87eb40c37dd6a33f0
 DIST libgdata-0.16.0.tar.xz 1552500 SHA256 66bc279ff8fbebb8eb2602d33e37e3140747ba1e4dc1f1b944c0f312f00ab479 SHA512 cca81a2400d637d017e90f22de80dd065f8568d3faafa17f6684e1f4c326ba162adb45aaea0558aa64068bf9545e51fb455d0f25f502a46b3ee2f0533ff95d65 WHIRLPOOL 2916bbd9d50ff636c6649f7b51b715489c86f77e154c3480549b0c90905e42ae80a8b8a30003a032655e7f18ae0eb405e32a2846c69686b1a7f2b980d04b7356
+DIST libgdata-0.16.1.tar.xz 1551960 SHA256 8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827 SHA512 81fd252e24ba0068b401e3de61b4a23575dae0790f4caf646e56a57aab815a70a207b2492efa4213f51ac1d7c752d4ec0c1c9a35d7109f6a63668af05e142039 WHIRLPOOL 892a7823a85bc771b502f7b564156eaede676c3e2cf7406e9b808a3f4fbfa6e9be1ad1ec1cb79ca1b42dc0bf54f6d46560e2a863e8861f186802a91f91de2d4d
 DIST libgdata-0.8.1.tar.bz2 1201616 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9 SHA512 61d65ceae7b82a497ba4c2c70a0486a108ae8dec9f0d7885fac8d33dd6a4f4d1eff068e39fb2ec5fed69f349de4d393adceca0ee242f2b4cb6045dbd48743643 WHIRLPOOL 0551ddcb3d9abb3e3633ffcb98e67036d5bdb914d3e95405b7c5568b471784548d02d3f4b0c4df4f76d2396a2be6400d564afc10527c2aa5ada9f812609ab8b0
diff --git a/dev-libs/libgdata/libgdata-0.16.1.ebuild b/dev-libs/libgdata/libgdata-0.16.1.ebuild
new file mode 100644
index 000000000000..ae309ad95d45
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.16.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.16.1.ebuild,v 1.1 2014/11/11 11:17:23 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/19" # subslot = libgdata soname version
+IUSE="gnome +introspection static-libs test vala"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_IUSE="vala? ( introspection )"
+
+# gtk+ is needed for gdk
+# configure checks for gtk:3, but only uses it for demos which are not installed
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/json-glib-0.15
+	>=dev-libs/libxml2-2:2
+	>=net-libs/liboauth-0.9.4
+	>=net-libs/libsoup-2.42.0:2.4[introspection?]
+	>=x11-libs/gdk-pixbuf-2.14:2
+	gnome? (
+		app-crypt/gcr:=
+		>=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40
+	>=gnome-base/gnome-common-3.6
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	# Disable tests requiring network access, bug #307725
+	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf calendar client-login-authorizer contacts documents oauth1-authorizer picasaweb youtube \nOLD_\1:' \
+		-i gdata/tests/Makefile.in || die "network test disable failed"
+
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_enable gnome) \
+		$(use_enable gnome goa) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory" #486412
+	dbus-launch emake check
+}
diff --git a/dev-libs/pakchois/pakchois-0.4-r2.ebuild b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
index 2d6fbe5fa584..4d612ac83397 100644
--- a/dev-libs/pakchois/pakchois-0.4-r2.ebuild
+++ b/dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pakchois/pakchois-0.4-r2.ebuild,v 1.9 2014/11/02 08:51:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pakchois/pakchois-0.4-r2.ebuild,v 1.10 2014/11/11 10:44:27 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.manyfish.co.uk/pakchois/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="nls"
 
 DEPEND=""
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild
index 27f45c2deb0c..bb2483916093 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild,v 1.5 2014/11/03 11:02:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.18.ebuild,v 1.6 2014/11/11 10:45:27 ago Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 #IUSE="java lua mono perl php python ruby tcl"
 #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 IUSE="java lua perl php python ruby tcl"
diff --git a/dev-libs/xapian/xapian-1.2.18.ebuild b/dev-libs/xapian/xapian-1.2.18.ebuild
index bdb8c85b85aa..b88ed3c59d11 100644
--- a/dev-libs/xapian/xapian-1.2.18.ebuild
+++ b/dev-libs/xapian/xapian-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.18.ebuild,v 1.3 2014/11/03 11:02:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.18.ebuild,v 1.4 2014/11/11 10:45:23 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs -sse +sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild b/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
index 3e6662a8efe2..ad63986a5415 100644
--- a/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild,v 1.1 2014/08/21 14:17:04 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild,v 1.2 2014/11/11 11:58:53 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="XS implementation of parts of Class::Load"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild b/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild
index 15165ce69cb3..9dd7025a0e58 100644
--- a/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild
+++ b/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild,v 1.2 2014/10/23 19:39:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Devel-StackTrace/Devel-StackTrace-1.300.0-r1.ebuild,v 1.3 2014/11/11 11:48:12 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Devel-StackTrace module for perl"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild b/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
index 19e56c32d079..c8af7e2e3a14 100644
--- a/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
+++ b/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild,v 1.2 2014/10/23 19:41:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Exception-Class/Exception-Class-1.370.0-r1.ebuild,v 1.3 2014/11/11 11:49:06 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A module that allows you to declare real exception classes in Perl"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild b/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
index 619d49e0dc26..780d685e9ae5 100644
--- a/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
+++ b/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild,v 1.2 2014/10/23 19:38:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-pushd/File-pushd-1.3.0-r1.ebuild,v 1.3 2014/11/11 11:53:23 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Change directory temporarily for a limited scope"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
index dd2547375374..28fe2826f292 100644
--- a/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
+++ b/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild,v 1.2 2014/10/23 19:42:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild,v 1.3 2014/11/11 11:54:51 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Perl encapsulation of invoking the Latex programs"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
index 60d3d8fa7fe4..1bd7180d21c2 100644
--- a/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
+++ b/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild,v 1.2 2014/10/23 19:41:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild,v 1.3 2014/11/11 11:51:42 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Encode characters for LaTeX formatting"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
index bfa523fec3fa..e7f9b531a53e 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild,v 1.2 2014/10/23 19:40:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild,v 1.3 2014/11/11 11:50:55 blueness Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Convert Pod data to formatted LaTeX"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.18.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.18.0.ebuild
index 302c5f22b90f..1c3fd1873238 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.18.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.18.0.ebuild,v 1.4 2014/11/03 11:02:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Search-Xapian/Search-Xapian-1.2.18.0.ebuild,v 1.5 2014/11/11 10:45:30 ago Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ia64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
 RDEPEND="~dev-libs/xapian-${VERSION}
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 96e2fa865eb0..2f47855c3634 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-2014 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.2 2014/07/30 16:57:11 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild,v 1.3 2014/11/11 12:00:52 blueness Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"
 
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/coverage/coverage-3.7.1.ebuild b/dev-python/coverage/coverage-3.7.1.ebuild
index b6f888817028..04e1385dac33 100644
--- a/dev-python/coverage/coverage-3.7.1.ebuild
+++ b/dev-python/coverage/coverage-3.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.7.1.ebuild,v 1.11 2014/11/02 09:18:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.7.1.ebuild,v 1.12 2014/11/11 11:14:25 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cython/cython-0.21.ebuild b/dev-python/cython/cython-0.21.ebuild
index f28f8fb9d6c7..a6442d4a1c56 100644
--- a/dev-python/cython/cython-0.21.ebuild
+++ b/dev-python/cython/cython-0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.ebuild,v 1.10 2014/11/02 09:18:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.21.ebuild,v 1.11 2014/11/11 11:14:29 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index b7c9fcf726ae..91b5766463c9 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.12.ebuild,v 1.8 2014/11/02 09:18:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.12.ebuild,v 1.9 2014/11/11 11:14:33 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/extras/extras-0.0.3.ebuild b/dev-python/extras/extras-0.0.3.ebuild
index 99685d2dbae5..27b03d9d98bd 100644
--- a/dev-python/extras/extras-0.0.3.ebuild
+++ b/dev-python/extras/extras-0.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/extras/extras-0.0.3.ebuild,v 1.23 2014/10/27 16:09:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/extras/extras-0.0.3.ebuild,v 1.24 2014/11/11 11:15:21 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
index a760f34db373..70f98d952d90 100644
--- a/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild,v 1.22 2014/10/27 16:10:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mimeparse/mimeparse-0.1.4-r1.ebuild,v 1.23 2014/11/11 11:15:18 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index c540ca6553ee..0e26a3660d21 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r2.ebuild,v 1.6 2014/11/03 11:20:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r2.ebuild,v 1.7 2014/11/11 11:15:07 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 
 # dev-python/unittest2 is not required with Python >=3.2.
diff --git a/dev-python/mysql-python/mysql-python-1.2.5.ebuild b/dev-python/mysql-python/mysql-python-1.2.5.ebuild
index 5b1b5186b7a5..a7d766755522 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.5.ebuild,v 1.11 2014/11/04 20:02:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.5.ebuild,v 1.12 2014/11/11 10:50:24 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="virtual/mysql"
diff --git a/dev-python/nose/nose-1.3.4.ebuild b/dev-python/nose/nose-1.3.4.ebuild
index 13ad527a5006..5f6ab93d42ac 100644
--- a/dev-python/nose/nose-1.3.4.ebuild
+++ b/dev-python/nose/nose-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.4.ebuild,v 1.8 2014/11/02 09:18:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.4.ebuild,v 1.9 2014/11/11 11:14:37 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
+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"
 IUSE="doc examples test"
 
 RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/pexpect/pexpect-3.3.ebuild b/dev-python/pexpect/pexpect-3.3.ebuild
index 547e25310a9b..7affd256db66 100644
--- a/dev-python/pexpect/pexpect-3.3.ebuild
+++ b/dev-python/pexpect/pexpect-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-3.3.ebuild,v 1.9 2014/11/02 09:18:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-3.3.ebuild,v 1.10 2014/11/11 11:14:43 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 DEPEND="
diff --git a/dev-python/psycopg/psycopg-2.5.3.ebuild b/dev-python/psycopg/psycopg-2.5.3.ebuild
index 7c1b481696f7..3ca40832a61e 100644
--- a/dev-python/psycopg/psycopg-2.5.3.ebuild
+++ b/dev-python/psycopg/psycopg-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.3.ebuild,v 1.7 2014/11/03 12:40:28 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.5.3.ebuild,v 1.8 2014/11/11 11:15:11 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=virtual/postgresql-8.1"
diff --git a/dev-python/py/py-1.4.25.ebuild b/dev-python/py/py-1.4.25.ebuild
index fdaf2b2a202a..314de50dd37c 100644
--- a/dev-python/py/py-1.4.25.ebuild
+++ b/dev-python/py/py-1.4.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.25.ebuild,v 1.8 2014/11/02 09:18:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.25.ebuild,v 1.9 2014/11/11 11:14:40 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~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"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild b/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
index 09ffa6f73fc9..11bed9e3a046 100644
--- a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
+++ b/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild,v 1.7 2014/11/02 09:18:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild,v 1.8 2014/11/11 11:14:47 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -17,7 +17,7 @@ SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest/pytest-2.6.3.ebuild b/dev-python/pytest/pytest-2.6.3.ebuild
index 2cf5e03f2001..b33c3183a0f7 100644
--- a/dev-python/pytest/pytest-2.6.3.ebuild
+++ b/dev-python/pytest/pytest-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.6.3.ebuild,v 1.8 2014/11/02 09:18:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.6.3.ebuild,v 1.9 2014/11/11 11:14:51 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~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"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python-ldap/python-ldap-2.4.15.ebuild b/dev-python/python-ldap/python-ldap-2.4.15.ebuild
index 4f5895701bd2..62bf3cb80a0b 100644
--- a/dev-python/python-ldap/python-ldap-2.4.15.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v 1.11 2014/11/04 09:23:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.15.ebuild,v 1.12 2014/11/11 10:53:16 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 # doc flag dropped due to absence of the docs
 IUSE="examples sasl ssl"
 
diff --git a/dev-python/pyyaml/pyyaml-3.11.ebuild b/dev-python/pyyaml/pyyaml-3.11.ebuild
index afc6384300fa..74f17c6ce472 100644
--- a/dev-python/pyyaml/pyyaml-3.11.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.11.ebuild,v 1.10 2014/11/02 09:18:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.11.ebuild,v 1.11 2014/11/11 11:14:54 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -15,7 +15,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/sphinx/sphinx-1.2.2.ebuild b/dev-python/sphinx/sphinx-1.2.2.ebuild
index 6d63d5c9613b..5d4ffa3b86d5 100644
--- a/dev-python/sphinx/sphinx-1.2.2.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2.2.ebuild,v 1.14 2014/11/02 09:18:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.2.2.ebuild,v 1.15 2014/11/11 11:14:58 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~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 latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
diff --git a/dev-python/testtools/testtools-0.9.36.ebuild b/dev-python/testtools/testtools-0.9.36.ebuild
index 0757fbc6f9c5..ada8f6bac668 100644
--- a/dev-python/testtools/testtools-0.9.36.ebuild
+++ b/dev-python/testtools/testtools-0.9.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.36.ebuild,v 1.6 2014/11/03 11:20:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.36.ebuild,v 1.7 2014/11/11 11:15:15 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 2994cdbdad74..cd6553749d51 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -2,3 +2,4 @@ DIST TwistedConch-12.3.0.tar.bz2 220999 SHA256 5d53e9c26c64e31168121565efbfeb117
 DIST TwistedConch-13.0.0.tar.bz2 223663 SHA256 7ebbd2ff600a4ee7da3e683b22be4ad97db79ee3b0af0c2758ca3f3788cf9ef2 SHA512 80fc9e2ca1ebd5477964c0de4d0050f1e8ff81ad5f02f836bfa7dd20be487763add83b4df2a038b9cd6066b82cfee2dad932b0f6f7bcbd67428b6babddc3afb0 WHIRLPOOL 2b4b8599f28c0a5980903d0e678a3e05d4bac99a0bc5aa3db6f2fe0bfb3b6336434678f680fc8e3afeb443c470e10e9b08a28dfc7a02cd2ae0a070e7d4258de5
 DIST TwistedConch-13.2.0.tar.bz2 243977 SHA256 1559f2070e47a8dfb63a387a8d8deb4dae73226429b26bf2983dc7d1df86cc69 SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043 WHIRLPOOL 7ddf201c17f6625cac09197bfc1b532d1f6f8bd01b888668ccb16b5577b235a3379af11e436e0a4ed308218b6fc27e1250841367dc8c191bc420f4a90a7a2a49
 DIST TwistedConch-14.0.0.tar.bz2 219179 SHA256 5d1023bec87d2c1bf4d1e85f62a5fa304d9b3bf13e86c0af74cc8c9fb4916a83 SHA512 24826cad92b2f3b13cf4a3e731cfff9e36d703b45b15404fad2bba91df60bcc60f4cf687a3f2e646457f00d28b4ac3fa019ee1751a538b213a10526ab5aa24b8 WHIRLPOOL 71ddad3e483ccc9780eb2420cc04827d0809eb77e7d2e93ec886e3ccd4369193b34da905bddcc95414037fb27509cf33be334d39be969b7cb3749940263bab6b
+DIST TwistedConch-14.0.1.tar.bz2 219255 SHA256 41303b4f09ca7dcfc0b7e796f5f18f83d16cfde789f86364328a08217c18564e SHA512 a4800c437b15ca51fd9151b39e59771ba0a18ea2e9e07fcab2b26eabee925a272ab3dbed114197c9b52f1985f1dd23afacc91591c58fe9e64080394865a77a25 WHIRLPOOL d3551c7a4b412955f653eb1b004fbbca358523761b21578d7886756e180e791d90ef8240e4d5917d65a714a87e348c9fff6077c285e348517409babda90dff0f
diff --git a/dev-python/twisted-conch/twisted-conch-14.0.1.ebuild b/dev-python/twisted-conch/twisted-conch-14.0.1.ebuild
new file mode 100644
index 000000000000..2d446070fad0
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-14.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-14.0.1.ebuild,v 1.1 2014/11/11 09:44:07 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+# Delete edits to tests for now since there is no test phase, for now"
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
index 5fd6cb717f03..6e81d7c1b4da 100644
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@@ -2,3 +2,4 @@ DIST TwistedCore-12.3.0.tar.bz2 1480622 SHA256 343dd7372b05d4aa0805406bcbee7db40
 DIST TwistedCore-13.0.0.tar.bz2 1495753 SHA256 989706fd39c8a28785bdecaa0145b81f7e159b9209d463b5885be7e5c34ff32f SHA512 624d73d267742cb5b97bed2a39e78caeb01ee5fa871a0a2133455809b1d2a695f0d375c022ae21e91ef20f92fdee05a08a11db7b6b1e92ec810d3e097f929972 WHIRLPOOL 02c25eb94ad0aaafea8e1599df387607c6a1323ac55c31b0e98a366f927da2245fc839f5a3509367ed18690694f8599ebb22c0b21b8c90dfbfe2e3727a7846ff
 DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c2751127738127e283112e72c2de6c28e36be SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6 WHIRLPOOL 21a90a98b36775db4e6154c30ea697ef53f4b94a30e1be125e420019d5200cbbf31178937c41b12ffb841b028875dbc6b1234cebf8036f4165d2908c431a6de4
 DIST TwistedCore-14.0.0.tar.bz2 1126188 SHA256 41fde42b917ea91c74e9ad15ae45a8104de156bcb32e7bb6a2dfa6c68141a72e SHA512 71294a10fb574d1794b730f11f89a689445ff13cf5553140dbbe049a03afe744bcc342cbff60b6d74714575bf840814fcddb0a7c94f5def1987966e0f1238704 WHIRLPOOL 1c68af280d33d0f6ce431a18f87bfa4f679aeab7f6217b388e8f7c7cb78d1b5e4587f3d3f02ccc0b7f87f6dc359c35aa15b0ee58f86385637a5d2236e7563c39
+DIST TwistedCore-14.0.1.tar.bz2 1126214 SHA256 4d80bb277bff34266fb03989d89f721ae41edfc755f4c0481813c04a759f16dc SHA512 44ef2e66636da1f7c6497cf1a4bacfdfdffd276e5b0f99b22c70f74a016de6f88a263fc549db3f04e09e86142514955bc79662760148680fb8ec823720a57a41 WHIRLPOOL ccd1acaf7f732d02b4fd45ca8285b8bbbcd3066176280b929a65879b4530f5158db8134296a35ffe565d2a8b72299ecf93329752bf5b409b60313a930cb1d876
diff --git a/dev-python/twisted-core/twisted-core-14.0.1.ebuild b/dev-python/twisted-core/twisted-core-14.0.1.ebuild
new file mode 100644
index 000000000000..f89d9e592104
--- /dev/null
+++ b/dev-python/twisted-core/twisted-core-14.0.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-14.0.1.ebuild,v 1.2 2014/11/11 07:33:23 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial test"
+
+RDEPEND=">=net-zope/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=(
+	# Give a load-sensitive test a better chance of succeeding.
+	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Skip a test if twisted conch is not available
+	# (see Twisted ticket #5703)
+	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local CFLAGS CXXFLAGS
+
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		append-flags -fno-strict-aliasing
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	# Skip broken tests.
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
+		|| die "sed failed"
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	# https://twistedmatrix.com/trac/ticket/6920 6921
+	# Just re-exposing them to list a full list of deficits
+#	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
+#	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
+
+	# Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
+	# test_loreDeprecation and test_exist failures appeared in version 14.0.0.
+	# Possibly due to over taxing of the distutils_install_for_testing function
+	rm -f twisted/python/test/test_release.py || die
+	sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
+	sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
+
+	# Requires connection to the network
+	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
+
+	# Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
+	# Upstream somewhat unreceptive
+	# The last of these invokes a hang or a long delay
+	sed -e 's:test_dataReceivedThrows:_&:' \
+		-e 's:test_resumeProducingThrows:_&:' \
+		-e 's:test_resumeProducingAbortLater:_&:' \
+		-e 's:test_resumeProducingAbort:_&:' \
+		-e 's:test_fullWriteBufferAfterByteExchange:_&:' \
+		-i twisted/internet/test/test_tcp.py || die
+	sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	local egg=( Twisted_Core*.egg-info )
+	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
diff --git a/dev-ruby/abstract/abstract-1.0.0-r2.ebuild b/dev-ruby/abstract/abstract-1.0.0-r2.ebuild
index cdb92e975ab9..7cb7b5356d6b 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r2.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r2.ebuild,v 1.6 2014/08/20 13:30:22 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r2.ebuild,v 1.7 2014/11/11 11:11:22 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index 93976149c76a..aa21403db488 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r3.ebuild,v 1.4 2014/08/20 13:30:22 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/abstract/abstract-1.0.0-r3.ebuild,v 1.5 2014/11/11 11:11:22 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 87116d68a7fa..72d8e6bc0d69 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1 +1,2 @@
 DIST acts_as_list-0.4.0.gem 16384 SHA256 504aa7ebbcf9dcec2929ac4f94bfb11aae52b6210ad573c07ec1897d8e865276 SHA512 14ac5b48b78a50f69f2c97d2c42e588ec9402499a8169c217b27e0b914a17a2bc58c91610ecb14de02482d0b72a96add9bb86d498d91198788b0738825b054d2 WHIRLPOOL 78d894f12a90bd0d687e27241eab1c3711a05462d2d98bbc4d22341bcc8b9b6b586273daed81eeb95167d3127b6dcec7427e4111c5e0fb2ca449063c8806453d
+DIST acts_as_list-0.5.0.gem 16896 SHA256 567f13b673144a2836495b379c1d462dff74491d45f7000b68a82fe4f856035e SHA512 b4fd105ead5d2276e9510747fe9fbdd9e5741982e104d0084442ee5492b81ee94cde8f29b0eb6d3ae5a55ad71ca544edd0a4d341541eec4e28226389b6b67d6c WHIRLPOOL fb6200b32d9d8314d77aa70eec0afd39bbb8ce37385c1cc33bec3758d132f7b3a2810d771b14d308effaca10b52362b8d8222e697638c4504b335739f810055d
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild
new file mode 100644
index 000000000000..97591538dbd3
--- /dev/null
+++ b/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/acts_as_list/acts_as_list-0.5.0.ebuild,v 1.1 2014/11/11 06:16:22 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
+HOMEPAGE="https://github.com/swanandp/acts_as_list"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activerecord-3"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+		dev-ruby/activerecord:3.2[sqlite3]
+	)"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '1,9 s:^:#:' test/helper.rb || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Tests currently only pass on rails 3.
+	sed -e '1igem "activerecord", "~>3.2.0"' -i test/helper.rb || die
+}
diff --git a/dev-ruby/allison/allison-2.0.3-r2.ebuild b/dev-ruby/allison/allison-2.0.3-r2.ebuild
index 630210282622..105ac22efb4b 100644
--- a/dev-ruby/allison/allison-2.0.3-r2.ebuild
+++ b/dev-ruby/allison/allison-2.0.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r2.ebuild,v 1.14 2014/09/19 09:22:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r2.ebuild,v 1.15 2014/11/11 11:09:41 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/allison/allison-2.0.3-r3.ebuild b/dev-ruby/allison/allison-2.0.3-r3.ebuild
index f965cd616204..4cae6f4b5cb1 100644
--- a/dev-ruby/allison/allison-2.0.3-r3.ebuild
+++ b/dev-ruby/allison/allison-2.0.3-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r3.ebuild,v 1.3 2014/08/05 16:00:37 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r3.ebuild,v 1.4 2014/11/11 11:09:41 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild b/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild
index 6fc5a5a1a28c..5e4d6799a0a4 100644
--- a/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild
+++ b/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild,v 1.3 2014/08/05 16:00:38 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild,v 1.4 2014/11/11 10:48:50 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
diff --git a/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild b/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild
index 01b7d7d7947d..870fe3b79d47 100644
--- a/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild
+++ b/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild,v 1.3 2014/04/05 14:15:15 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-s3/aws-s3-0.6.3.ebuild,v 1.4 2014/11/11 11:06:37 mrueg Exp $
 
 EAPI=4
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/bourne/bourne-1.5.0-r1.ebuild b/dev-ruby/bourne/bourne-1.5.0-r1.ebuild
index d7d6371e4bca..681eecb6974e 100644
--- a/dev-ruby/bourne/bourne-1.5.0-r1.ebuild
+++ b/dev-ruby/bourne/bourne-1.5.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bourne/bourne-1.5.0-r1.ebuild,v 1.5 2014/11/05 11:36:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bourne/bourne-1.5.0-r1.ebuild,v 1.6 2014/11/11 11:09:07 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild
index 978066cbfba5..f7c17b6de8f8 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild,v 1.15 2014/04/05 23:00:13 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.1.3.ebuild,v 1.16 2014/11/11 11:00:04 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
index f146fb670f9c..207fa47497e7 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild,v 1.4 2014/08/13 18:31:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild,v 1.5 2014/11/11 11:00:04 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild
index 9580d8b786f7..fbeacfdeef6e 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild,v 1.10 2014/08/25 16:01:51 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/diff-lcs/diff-lcs-1.2.5.ebuild,v 1.11 2014/11/11 11:00:04 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/domain_name/domain_name-0.5.13.ebuild b/dev-ruby/domain_name/domain_name-0.5.13.ebuild
index 62bd207e6bfb..15d999ac67ac 100644
--- a/dev-ruby/domain_name/domain_name-0.5.13.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.13.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.13.ebuild,v 1.4 2014/04/24 20:26:56 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.13.ebuild,v 1.5 2014/11/11 10:57:11 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/domain_name/domain_name-0.5.19.ebuild b/dev-ruby/domain_name/domain_name-0.5.19.ebuild
index 5c5ab4a17740..2a1eea370d48 100644
--- a/dev-ruby/domain_name/domain_name-0.5.19.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.19.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.19.ebuild,v 1.2 2014/06/14 03:11:09 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.19.ebuild,v 1.3 2014/11/11 10:57:11 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/domain_name/domain_name-0.5.20.ebuild b/dev-ruby/domain_name/domain_name-0.5.20.ebuild
index e03f06771f02..d8e3a28f6022 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.20.ebuild,v 1.1 2014/08/20 13:01:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/domain_name/domain_name-0.5.20.ebuild,v 1.2 2014/11/11 10:57:11 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/facter/facter-1.7.1-r1.ebuild b/dev-ruby/facter/facter-1.7.1-r1.ebuild
index bcd610b53ac2..438f2f29e20c 100644
--- a/dev-ruby/facter/facter-1.7.1-r1.ebuild
+++ b/dev-ruby/facter/facter-1.7.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.1-r1.ebuild,v 1.9 2014/05/26 05:20:27 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.1-r1.ebuild,v 1.10 2014/11/11 11:01:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-1.7.6.ebuild b/dev-ruby/facter/facter-1.7.6.ebuild
index fdafe2040ca0..a423146d8ea1 100644
--- a/dev-ruby/facter/facter-1.7.6.ebuild
+++ b/dev-ruby/facter/facter-1.7.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.6.ebuild,v 1.7 2014/08/13 17:37:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.6.ebuild,v 1.8 2014/11/11 11:01:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-2.0.2.ebuild b/dev-ruby/facter/facter-2.0.2.ebuild
index 8f105810367c..4088b21d6293 100644
--- a/dev-ruby/facter/facter-2.0.2.ebuild
+++ b/dev-ruby/facter/facter-2.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.0.2.ebuild,v 1.2 2014/08/19 11:18:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.0.2.ebuild,v 1.3 2014/11/11 11:01:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-2.1.0.ebuild b/dev-ruby/facter/facter-2.1.0.ebuild
index 6aa47ec87ad0..3c81bed60909 100644
--- a/dev-ruby/facter/facter-2.1.0.ebuild
+++ b/dev-ruby/facter/facter-2.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.1.0.ebuild,v 1.2 2014/08/19 11:18:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.1.0.ebuild,v 1.3 2014/11/11 11:01:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/facter/facter-2.2.0.ebuild b/dev-ruby/facter/facter-2.2.0.ebuild
index 4f63c6309696..ed6677782513 100644
--- a/dev-ruby/facter/facter-2.2.0.ebuild
+++ b/dev-ruby/facter/facter-2.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.2.0.ebuild,v 1.1 2014/08/30 02:09:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-2.2.0.ebuild,v 1.2 2014/11/11 11:01:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/hiera/hiera-1.2.1.ebuild b/dev-ruby/hiera/hiera-1.2.1.ebuild
index 2dc6ca55ecca..59b930b68338 100644
--- a/dev-ruby/hiera/hiera-1.2.1.ebuild
+++ b/dev-ruby/hiera/hiera-1.2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.2.1.ebuild,v 1.8 2014/04/05 17:56:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.2.1.ebuild,v 1.9 2014/11/11 11:06:51 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/hike/hike-1.2.3-r1.ebuild b/dev-ruby/hike/hike-1.2.3-r1.ebuild
index e119d7c18b50..59101639177d 100644
--- a/dev-ruby/hike/hike-1.2.3-r1.ebuild
+++ b/dev-ruby/hike/hike-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-1.2.3-r1.ebuild,v 1.4 2014/08/12 18:56:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-1.2.3-r1.ebuild,v 1.5 2014/11/11 10:48:20 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/hike/hike-1.2.3.ebuild b/dev-ruby/hike/hike-1.2.3.ebuild
index 6d470a7c86ae..7f728a034919 100644
--- a/dev-ruby/hike/hike-1.2.3.ebuild
+++ b/dev-ruby/hike/hike-1.2.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-1.2.3.ebuild,v 1.4 2014/08/12 18:56:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-1.2.3.ebuild,v 1.5 2014/11/11 10:48:20 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_TEST="none"
 
diff --git a/dev-ruby/hike/hike-2.1.2.ebuild b/dev-ruby/hike/hike-2.1.2.ebuild
index 41cc1c1e4dbe..9ca62541f154 100644
--- a/dev-ruby/hike/hike-2.1.2.ebuild
+++ b/dev-ruby/hike/hike-2.1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-2.1.2.ebuild,v 1.3 2014/08/12 18:56:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hike/hike-2.1.2.ebuild,v 1.4 2014/11/11 10:48:20 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/listen/listen-0.7.3-r1.ebuild b/dev-ruby/listen/listen-0.7.3-r1.ebuild
index dfacb7a3ed78..c7d7720ba7db 100644
--- a/dev-ruby/listen/listen-0.7.3-r1.ebuild
+++ b/dev-ruby/listen/listen-0.7.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3-r1.ebuild,v 1.3 2014/09/19 05:38:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3-r1.ebuild,v 1.4 2014/11/11 11:04:34 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/listen/listen-0.7.3-r2.ebuild b/dev-ruby/listen/listen-0.7.3-r2.ebuild
index 2446b1f0a5d4..dc4af11287aa 100644
--- a/dev-ruby/listen/listen-0.7.3-r2.ebuild
+++ b/dev-ruby/listen/listen-0.7.3-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3-r2.ebuild,v 1.1 2014/09/19 05:38:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3-r2.ebuild,v 1.2 2014/11/11 11:04:34 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/listen/listen-0.7.3.ebuild b/dev-ruby/listen/listen-0.7.3.ebuild
index 488aa18fabf4..6e70dfd7e891 100644
--- a/dev-ruby/listen/listen-0.7.3.ebuild
+++ b/dev-ruby/listen/listen-0.7.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3.ebuild,v 1.5 2014/08/05 16:00:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-0.7.3.ebuild,v 1.6 2014/11/11 11:04:34 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/listen/listen-1.3.1-r2.ebuild b/dev-ruby/listen/listen-1.3.1-r2.ebuild
index 3c2e71baf27e..d785ba1d54b4 100644
--- a/dev-ruby/listen/listen-1.3.1-r2.ebuild
+++ b/dev-ruby/listen/listen-1.3.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-1.3.1-r2.ebuild,v 1.2 2014/08/05 16:00:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/listen/listen-1.3.1-r2.ebuild,v 1.3 2014/11/11 11:04:34 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/logging/logging-1.8.2.ebuild b/dev-ruby/logging/logging-1.8.2.ebuild
index 2c6a27402cca..dff8cf70da58 100644
--- a/dev-ruby/logging/logging-1.8.2.ebuild
+++ b/dev-ruby/logging/logging-1.8.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/logging/logging-1.8.2.ebuild,v 1.3 2014/08/06 07:54:16 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/logging/logging-1.8.2.ebuild,v 1.4 2014/11/11 10:47:46 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RAKE_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/multipart-post/multipart-post-1.2.0.ebuild b/dev-ruby/multipart-post/multipart-post-1.2.0.ebuild
index 03d8eadfc684..3e68bd411098 100644
--- a/dev-ruby/multipart-post/multipart-post-1.2.0.ebuild
+++ b/dev-ruby/multipart-post/multipart-post-1.2.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multipart-post/multipart-post-1.2.0.ebuild,v 1.4 2014/08/15 13:28:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multipart-post/multipart-post-1.2.0.ebuild,v 1.5 2014/11/11 11:07:35 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild b/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild
index e4c384ee971d..73e7bd58ad2c 100644
--- a/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild
+++ b/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild,v 1.4 2014/08/15 13:28:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multipart-post/multipart-post-2.0.0.ebuild,v 1.5 2014/11/11 11:07:35 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/oauth/oauth-0.4.7-r1.ebuild b/dev-ruby/oauth/oauth-0.4.7-r1.ebuild
index dfc4634cb230..e448f633225a 100644
--- a/dev-ruby/oauth/oauth-0.4.7-r1.ebuild
+++ b/dev-ruby/oauth/oauth-0.4.7-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r1.ebuild,v 1.2 2014/08/05 16:00:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r1.ebuild,v 1.3 2014/11/11 11:07:52 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/oauth/oauth-0.4.7-r2.ebuild b/dev-ruby/oauth/oauth-0.4.7-r2.ebuild
index 683c8184b86f..023cbd872a86 100644
--- a/dev-ruby/oauth/oauth-0.4.7-r2.ebuild
+++ b/dev-ruby/oauth/oauth-0.4.7-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild,v 1.2 2014/08/05 16:00:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth/oauth-0.4.7-r2.ebuild,v 1.3 2014/11/11 11:07:52 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild b/dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild
index 2f4b0b231fe2..367c5f6fd6ef 100644
--- a/dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild
+++ b/dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild,v 1.1 2014/08/13 01:58:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild,v 1.2 2014/11/11 11:08:27 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/rainbow/rainbow-1.1.4.ebuild b/dev-ruby/rainbow/rainbow-1.1.4.ebuild
index 2468e33d206a..3f6f34e856d4 100644
--- a/dev-ruby/rainbow/rainbow-1.1.4.ebuild
+++ b/dev-ruby/rainbow/rainbow-1.1.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rainbow/rainbow-1.1.4.ebuild,v 1.10 2014/08/05 15:47:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rainbow/rainbow-1.1.4.ebuild,v 1.11 2014/11/11 11:08:27 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/rash/rash-0.4.0-r1.ebuild b/dev-ruby/rash/rash-0.4.0-r1.ebuild
index c7e839e6f9da..f64071a1ad6a 100644
--- a/dev-ruby/rash/rash-0.4.0-r1.ebuild
+++ b/dev-ruby/rash/rash-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rash/rash-0.4.0-r1.ebuild,v 1.3 2014/08/06 07:06:54 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rash/rash-0.4.0-r1.ebuild,v 1.4 2014/11/11 11:05:41 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild
index ab551efd2c4b..32452050aba7 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild,v 1.1 2014/07/25 03:08:55 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.38-r1.ebuild,v 1.2 2014/11/11 10:46:47 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
diff --git a/dev-ruby/rdtool/rdtool-0.6.38.ebuild b/dev-ruby/rdtool/rdtool-0.6.38.ebuild
index e512722a8559..107bdbb372d6 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.38.ebuild,v 1.10 2014/04/05 23:00:31 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.38.ebuild,v 1.11 2014/11/11 10:46:47 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
diff --git a/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild b/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild
index 1c304c392031..53b9fab3d5ca 100644
--- a/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild
+++ b/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild,v 1.3 2014/08/02 02:49:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/require_relative/require_relative-1.0.3-r1.ebuild,v 1.4 2014/11/11 11:03:58 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 # Documentation can be generated using rocco but that is not available
 # yet.
diff --git a/dev-ruby/rexical/files/rexical-1.0.4-ruby187.patch b/dev-ruby/rexical/files/rexical-1.0.4-ruby187.patch
deleted file mode 100644
index 6d5d8096e9fe..000000000000
--- a/dev-ruby/rexical/files/rexical-1.0.4-ruby187.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0def37146dce8b2795443b04237e4e345dbaf59c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Fri, 15 Jan 2010 14:54:45 +0100
-Subject: [PATCH] Make rexcmd.rb compatible with both MRI 1.8.7 and 1.9.
-
-As it was, rex only worked fine with JRuby 1.4.0 on Gentoo, and not with
-either MRI implementation. With this change, OPTIONS (which is a string) is
-used properly and works with all three implementations.
----
- lib/rexical/rexcmd.rb |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/rexical/rexcmd.rb b/lib/rexical/rexcmd.rb
-index 844bbf6..30b3300 100644
---- a/lib/rexical/rexcmd.rb
-+++ b/lib/rexical/rexcmd.rb
-@@ -63,7 +63,7 @@ EOT
-   def initialize
-     @status  =  2
-     @cmd  =  File.basename($0, ".rb")
--    tmp  =  OPTIONS.collect do |line|
-+    tmp  =  OPTIONS.lines.collect do |line|
-         next if /\A\s*\z/ === line
-         disp, sopt, lopt, takearg, doc  =  line.strip.split(/\s+/, 5)
-         a  =  []
-@@ -109,7 +109,7 @@ Usage: #{@cmd} [options] <grammar file>
- Options:
-     EOT
- 
--    OPTIONS.each do |line|
-+    OPTIONS.each_line do |line|
-       next if line.strip.empty?
-       if /\A\s*\z/ === line
-         f.puts
--- 
-1.6.6
-
diff --git a/dev-ruby/rexical/rexical-1.0.5-r1.ebuild b/dev-ruby/rexical/rexical-1.0.5-r1.ebuild
deleted file mode 100644
index 9ab882d40ce8..000000000000
--- a/dev-ruby/rexical/rexical-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +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/rexical/rexical-1.0.5-r1.ebuild,v 1.14 2014/04/05 23:30:25 mrueg Exp $
-
-EAPI=2
-
-USE_RUBY="ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc DOCUMENTATION.en.rdoc  DOCUMENTATION.ja.rdoc  README.ja  README.rdoc"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Rexical is a lexical scanner generator"
-HOMEPAGE="http://github.com/tenderlove/rexical/tree/master"
-LICENSE="LGPL-2" # plus exception
-
-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"
-SLOT="0"
-IUSE=""
-
-# File collision, bug 459116
-RDEPEND+=" !!app-admin/rex"
-
-ruby_add_bdepend "
-	doc? ( >=dev-ruby/hoe-2.6.2 )
-	test? (
-		>=dev-ruby/hoe-2.6.2
-	)"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc sample/* || die
-}
diff --git a/dev-ruby/rexical/rexical-1.0.5-r2.ebuild b/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
index 5d3dbeeda73b..0e6c76e84676 100644
--- a/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rexical/rexical-1.0.5-r2.ebuild,v 1.9 2014/08/15 17:24:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rexical/rexical-1.0.5-r2.ebuild,v 1.11 2014/11/11 10:34:20 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="http://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/right_aws/right_aws-1.10.0.ebuild b/dev-ruby/right_aws/right_aws-1.10.0.ebuild
index 957f2ce4c41c..da3f8c644c5e 100644
--- a/dev-ruby/right_aws/right_aws-1.10.0.ebuild
+++ b/dev-ruby/right_aws/right_aws-1.10.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/right_aws/right_aws-1.10.0.ebuild,v 1.3 2014/08/05 16:00:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/right_aws/right_aws-1.10.0.ebuild,v 1.4 2014/11/11 10:50:01 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/right_aws/right_aws-3.0.4.ebuild b/dev-ruby/right_aws/right_aws-3.0.4.ebuild
index 9bebe400646b..45c2a3cc7db7 100644
--- a/dev-ruby/right_aws/right_aws-3.0.4.ebuild
+++ b/dev-ruby/right_aws/right_aws-3.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/right_aws/right_aws-3.0.4.ebuild,v 1.3 2014/08/05 16:00:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/right_aws/right_aws-3.0.4.ebuild,v 1.4 2014/11/11 10:50:01 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/robots/robots-0.10.1-r2.ebuild b/dev-ruby/robots/robots-0.10.1-r2.ebuild
index 933bcf89e0c9..fe4c972b9784 100644
--- a/dev-ruby/robots/robots-0.10.1-r2.ebuild
+++ b/dev-ruby/robots/robots-0.10.1-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/robots/robots-0.10.1-r2.ebuild,v 1.3 2014/08/06 07:10:16 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/robots/robots-0.10.1-r2.ebuild,v 1.4 2014/11/11 11:03:01 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
 
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild
index cfdf119e195e..ffa5780630fd 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild,v 1.12 2014/04/05 22:57:59 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.12.1.ebuild,v 1.13 2014/11/11 11:02:09 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
index ec3a24769af4..7f776da70a3e 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild,v 1.3 2014/08/13 18:33:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.14.6-r1.ebuild,v 1.4 2014/11/11 11:02:09 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild
index 6490664436a8..5a0c1c368427 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild,v 1.10 2014/08/25 16:03:00 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.14.6.ebuild,v 1.11 2014/11/11 11:02:09 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index 927146aac851..ec1d1e343c9a 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild,v 1.2 2014/08/13 18:33:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild,v 1.3 2014/11/11 11:02:09 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild
index 0b0f95ed3885..d20fa59e5c0b 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild,v 1.20 2014/08/17 00:45:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.3.3.ebuild,v 1.21 2014/11/11 11:05:38 mrueg Exp $
 
 EAPI=4
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_NAME="${PN/ruby-/}"
 RUBY_FAKEGEM_VERSION="${PV%_*}"
diff --git a/dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild b/dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild
index 01554f5db438..8a876032aa9a 100644
--- a/dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild
+++ b/dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild,v 1.3 2014/08/06 07:32:27 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inifile/ruby-inifile-2.0.0-r2.ebuild,v 1.4 2014/11/11 11:10:36 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 inherit ruby-ng
 
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild
index 036f41535c8a..b8b4cbf6ebf1 100644
--- a/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild
+++ b/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild,v 1.5 2014/04/24 20:10:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-openid/ruby-openid-2.2.2.ebuild,v 1.6 2014/11/11 10:55:55 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.1.ebuild
index b2a910b38ed2..e8c8a302509c 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.1.ebuild,v 1.7 2014/08/02 18:17:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-progressbar/ruby-progressbar-1.4.1.ebuild,v 1.8 2014/11/11 11:05:38 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rubypants/rubypants-0.2.0-r4.ebuild b/dev-ruby/rubypants/rubypants-0.2.0-r4.ebuild
index 35641e9c86f4..9c29de4f1dae 100644
--- a/dev-ruby/rubypants/rubypants-0.2.0-r4.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.2.0-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubypants/rubypants-0.2.0-r4.ebuild,v 1.5 2014/08/05 16:00:29 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubypants/rubypants-0.2.0-r4.ebuild,v 1.6 2014/11/11 11:10:25 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild b/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild
index b35e6b03bca5..eabca6608d95 100644
--- a/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild
+++ b/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild,v 1.3 2014/08/05 16:00:29 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubypants/rubypants-0.2.0-r5.ebuild,v 1.4 2014/11/11 11:10:25 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/stomp/stomp-1.2.16.ebuild b/dev-ruby/stomp/stomp-1.2.16.ebuild
index 58891a75de63..16ebd044a2cf 100644
--- a/dev-ruby/stomp/stomp-1.2.16.ebuild
+++ b/dev-ruby/stomp/stomp-1.2.16.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.2.16.ebuild,v 1.4 2014/04/19 03:28:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.2.16.ebuild,v 1.5 2014/11/11 11:04:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
diff --git a/dev-ruby/stomp/stomp-1.3.2.ebuild b/dev-ruby/stomp/stomp-1.3.2.ebuild
index ec1aa355d96e..fd426d998630 100644
--- a/dev-ruby/stomp/stomp-1.3.2.ebuild
+++ b/dev-ruby/stomp/stomp-1.3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.3.2.ebuild,v 1.3 2014/08/06 07:28:19 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stomp/stomp-1.3.2.ebuild,v 1.4 2014/11/11 11:04:16 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild
index e38adc62f9fc..459eda48fc69 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 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.2.2-r1.ebuild,v 1.8 2014/11/08 11:46:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/term-ansicolor-1.2.2-r1.ebuild,v 1.9 2014/11/11 11:04:45 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild
index 37745643b2f0..0ef1d5b57eea 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 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.0.ebuild,v 1.3 2014/08/05 16:00:40 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/term-ansicolor-1.3.0.ebuild,v 1.4 2014/11/11 11:04:45 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
index c854ad09dd8e..3b362f85b4e6 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild,v 1.3 2014/08/05 16:00:26 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1-r1.ebuild,v 1.4 2014/11/11 11:04:52 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
index c0c9a373ed0e..9783028ed725 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild,v 1.12 2014/08/05 16:00:27 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/text-hyphen/text-hyphen-1.4.1.ebuild,v 1.13 2014/11/11 11:04:52 mrueg Exp $
 
 EAPI=4
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/timecop/timecop-0.6.0.ebuild b/dev-ruby/timecop/timecop-0.6.0.ebuild
index 6ec3674890ec..ea63bd00081f 100644
--- a/dev-ruby/timecop/timecop-0.6.0.ebuild
+++ b/dev-ruby/timecop/timecop-0.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.6.0.ebuild,v 1.8 2014/08/02 18:17:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.6.0.ebuild,v 1.9 2014/11/11 10:55:03 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/timers/timers-1.1.0-r1.ebuild b/dev-ruby/timers/timers-1.1.0-r1.ebuild
index b3e0d9d0efaf..9cb3b8409bad 100644
--- a/dev-ruby/timers/timers-1.1.0-r1.ebuild
+++ b/dev-ruby/timers/timers-1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timers/timers-1.1.0-r1.ebuild,v 1.4 2014/08/12 22:44:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timers/timers-1.1.0-r1.ebuild,v 1.5 2014/11/11 10:47:22 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild b/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
index 466b256a77bd..544882a4af8a 100644
--- a/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
+++ b/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild,v 1.7 2014/04/05 15:02:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tmail/tmail-1.2.7.1-r3.ebuild,v 1.8 2014/11/11 10:54:36 mrueg Exp $
 
 EAPI=2
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
index a1435a1e1aff..e7639f728577 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild,v 1.5 2014/07/18 13:06:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.3.ebuild,v 1.6 2014/11/11 10:54:04 mrueg Exp $
 
 EAPI=2
 
-USE_RUBY="ruby19 jruby"
+USE_RUBY="ruby19"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild
index 717241a1f4e2..a879ff0a1a6c 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild,v 1.5 2014/08/25 16:22:48 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild,v 1.6 2014/11/11 10:54:04 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild
index 40dddf01db06..aa9c7ebb4ab9 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild,v 1.2 2014/07/18 13:06:49 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.4-r3.ebuild,v 1.3 2014/11/11 10:54:04 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild b/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild
index 35d28f975ac9..217785828e1b 100644
--- a/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild
+++ b/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild,v 1.3 2014/10/05 09:30:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uuidtools/uuidtools-2.1.5.ebuild,v 1.4 2014/11/11 10:54:04 mrueg Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/xpath/xpath-1.0.0-r1.ebuild b/dev-ruby/xpath/xpath-1.0.0-r1.ebuild
index 7b008a93f03c..594df77c5876 100644
--- a/dev-ruby/xpath/xpath-1.0.0-r1.ebuild
+++ b/dev-ruby/xpath/xpath-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xpath/xpath-1.0.0-r1.ebuild,v 1.4 2014/10/10 21:53:39 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xpath/xpath-1.0.0-r1.ebuild,v 1.5 2014/11/11 10:53:33 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/xpath/xpath-2.0.0-r1.ebuild b/dev-ruby/xpath/xpath-2.0.0-r1.ebuild
index a1f0676af9d0..021def721d39 100644
--- a/dev-ruby/xpath/xpath-2.0.0-r1.ebuild
+++ b/dev-ruby/xpath/xpath-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xpath/xpath-2.0.0-r1.ebuild,v 1.4 2014/08/05 16:00:31 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/xpath/xpath-2.0.0-r1.ebuild,v 1.5 2014/11/11 10:53:33 mrueg Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 9fa24c7fd5c0..f99e011f1830 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.9 2014/10/30 13:21:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.10 2014/11/11 11:00:24 pacho Exp $
 
 # @ECLASS: vala.eclass
 # @MAINTAINER:
@@ -26,8 +26,8 @@ esac
 
 # @ECLASS-VARIABLE: VALA_MIN_API_VERSION
 # @DESCRIPTION:
-# Minimum vala API version (e.g. 0.18).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.18}
+# Minimum vala API version (e.g. 0.20).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
 
 # @ECLASS-VARIABLE: VALA_MAX_API_VERSION
 # @DESCRIPTION:
@@ -50,7 +50,7 @@ vala_api_versions() {
 	local minimal_supported_minor_version minor_version
 
 	# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
-	minimal_supported_minor_version="18"
+	minimal_supported_minor_version="20"
 
 	for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
 		if ((minor_version >= minimal_supported_minor_version)); then
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 1e5499057e4b..3c5adce1e931 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,5 @@
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
 DIST evolution-data-server-3.12.4.tar.xz 5450044 SHA256 5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7 SHA512 24e3ff14c54845c22e038034ea537e5a1f9a57cd7d7aab8a5b16db3a40bf394282c47467b2b5829ab577e275eaabcd566b4a9ba1a18dd185f4dbe0818ff94cc8 WHIRLPOOL f8989993970adbcd10fd3511d4ad0ceeff6897509c4f048c3c993be6ef6de858fe1a20889eaeebda096b31b159a5b0dfd68cea191bfad88330c2662cf295ee41
-DIST evolution-data-server-3.12.6.tar.xz 5396524 SHA256 f05ea462b591b24b927afd943258199a4c05f23ff07fa04355bc04bcec15a7c2 SHA512 2d751af6a9481806722031528d5405de006a1d30bcb7dca0a92f9b4f40160e66df7e960ed3d126a10165c9e67788a6663076eb8d8b3c696c0466bb64a269dcce WHIRLPOOL 51ff4a1c13aec816bc10530d583f9a15179584f33783a51efe35158f880c99a55a202802b220689ba2931cb71e4ad83d5c118b593d9093af4a37b5f08e1a80a5
 DIST evolution-data-server-3.12.7.1.tar.xz 5390360 SHA256 7b2cc3169267801aef2b76a832a7df72af7bd1931fe1d98f474df9f306d4f79e SHA512 7fb39aa68d141eb51fed246e940c58baac612f58caad01a6880c285fe7393049276130462f8e3b992ac6ea0d1adf6339c90170db62f01028f265ecc5b447ef8f WHIRLPOOL 2975b69f0e3379f6341569180ecc7db310e888c1b874e38f12e9f7f1e6da569d4084177db18b9244337e5ce06135dddf35f078febd16a1b7c9a84ad87adb469c
+DIST evolution-data-server-3.12.8.tar.xz 5392696 SHA256 06fb4b9a1137b77a53e94eb69e4aeedd8f92d1bd1cfa0175f607660dd3b30818 SHA512 570b2c7b160a625517bc85de690f3fad03bef0fbb8bd2019e597f3a4071833478bae64c253a4fcb97c9025b8f1f97e927729caa484c207bb486d9891faccfcd6 WHIRLPOOL 15e9b3bae7b1e24c10e497a9b17571a26bc35e15b871d6a56ad5076a2795f2a86aa1b3d753f4dc1fe98b0c38155522a9bde983d3484c65e6a94b3d684840c259
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.8.ebuild
similarity index 97%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.12.8.ebuild
index 2f21a93ed291..a93a5c0441db 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.12.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.6.ebuild,v 1.2 2014/10/02 09:42:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.8.ebuild,v 1.1 2014/11/11 11:40:44 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 0b5f8a9d2106..652910bf675e 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,3 @@
 DIST evolution-ews-3.12.4.tar.xz 653228 SHA256 a7c6bc77dfc9049e5d92f2fbc52725023868fb8a68e1a6e3efaa6f2c5404a8b7 SHA512 20db3bce94e25bde9da93308e306b0b50c2a21dc24362545fdec6eea0ce85ec605150151f383233bb5ad323dc0724841d986ce4bacaf0d156769195dea2c9a1b WHIRLPOOL d8f09d59526daa87c19db87d57c59f783b5cdd714539da55c17d8c282bc8c075eb86b8914816e56fb8d0acfd5f5fcf790cfc48d2a5e81bee0894f21d95d4230a
-DIST evolution-ews-3.12.6.tar.xz 656572 SHA256 c77a9ace421100607bbc6ce6cf31ac65be8357f52a9ed23e2e83af36669d125e SHA512 1cd7f741b74b60ef8ddb9233ecf770a0d921461e6fbb4fb4d2d8a06bbe4e804b3d4dca7f05b6df55dcc26ef24d60a199fb5d95fcab3d96b6a43979195b8b41b7 WHIRLPOOL b4890d08df65eced046fdfbc8c7d7f80f9a604de98ea667c452727186fd640ab1cdf475660eb8beecae7028d3966c9741688ce520015f734c5afa791155ca279
 DIST evolution-ews-3.12.7.tar.xz 661880 SHA256 138fb6c4cdb36757b3c1efc430b5392d30fe7520c280168c80687627fc325671 SHA512 4503b68f23171bbcdc389bdef8a94df8d9a2f77df835b94cb5cb503b39438bcda4c62403d4477a84ccf14ca832b3a395e9ce3ed2fb3da09607b370bc7fe1102f WHIRLPOOL 62a2edbf068453f857f4ee5b99225a5238185994d39b51280b7fa8635b4936542d75eef6ecaae9e40f3603f2b83ccebb501022eb629a5a0efb69b47443440a7f
+DIST evolution-ews-3.12.8.tar.xz 662132 SHA256 808783683bef9fd0c41b0c27f94669418c95ebf7bc62120e10f674f1f2f686b5 SHA512 99d0a55da320f60ec42c1b4f51b3940bb01a419682524aa893a89d2b7ff536f65da19441bea9d346633b576f509a08e1d128feb9fb3e8f6bf55ef9ef7f53363c WHIRLPOOL 897d8e4809cab7b902a3aeb35d58ebea7e1cef78883a1b3c11d533dcb4a56b35d6b6e53dd1bba3c58e67805883ac309fb209d60256235fb4aba38dfa47a9fefb
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.12.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.12.8.ebuild
similarity index 93%
rename from gnome-extra/evolution-ews/evolution-ews-3.12.6.ebuild
rename to gnome-extra/evolution-ews/evolution-ews-3.12.8.ebuild
index 13c4fa258a13..f2211c1bb993 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.12.6.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.12.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.12.6.ebuild,v 1.1 2014/09/25 09:32:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-ews/evolution-ews-3.12.8.ebuild,v 1.1 2014/11/11 11:42:52 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
index 4af250820de6..a97435e3a727 100644
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
-DIST tracker-1.0.4.tar.xz 6169216 SHA256 cd9d0ebb2f09b581b3da607aeca96ec770ba1548c98f541dc3428bc945ff9886 SHA512 73aaa40b1bd1be74691104946f0a3c3ba240a13a01a123a5d2cc421ee50d36369dd0c64bb0890081c05374fb6f4e3dd8ea5058239bbe5a4dd2ad9ce9418d54fd WHIRLPOOL 11d71d86440fff33cc488642450368039dfdce1005f1fde1933529e19e0140580fe63a36852067bc6e6a773a976c6a2b71cf389119d267d6f734a40e8252ceb1
 DIST tracker-1.0.5.tar.xz 6061704 SHA256 9e77f8f731f44782a1468cc6dcf7f76bc9d7d7eb462c1b34062981a9c348ef16 SHA512 d5601a1d89bd6da52750b55a742005897fc4c4bd2280a5e56c462b3542473b8172d21c1e3a57cdb3e81c3ed5ed7810510e82e601fa43723df3c41a3100f61fd7 WHIRLPOOL 1165cd8a0e29fa13fe6a0410b8f9de3d277fc032496a13d2c6bca1cd9187d5bfc829ea05380d22a3262ac966a422a8bd85a9ab0fc4d7ffc8b76bddabdd2634e8
+DIST tracker-1.0.6.tar.xz 5975264 SHA256 e351ac3c182fc740afdc651d3884f8af0a8f897948a9ecc784d91bb1f9af62f9 SHA512 687ba883513a6854e99e3adc0fc5cfd2e2fb66b38486079ed178bd7c5730def4e5a8e07de32f081b30d9ac93dca5418d5c9ba782c3f80c539b3fa05b829b4b17 WHIRLPOOL 1c289d84ce63638e4a141b34d316dfaa69df26f58ac8f72154ee30e0a0bd60c3b14255cd5d900f671dd79f46d48cf3952f13b6f2e391e4b32320aca6e540a58f
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.4.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild
similarity index 92%
rename from gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.4.ebuild
rename to gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild
index e487212dcd89..12247c7ef667 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.4.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.4.ebuild,v 1.1 2014/09/05 09:31:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.0.6.ebuild,v 1.1 2014/11/11 10:54:34 pacho Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="tracker"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index cf83a31c268e..a989a96479f6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,5 @@
 DIST evolution-2.32.3-patches.tar.xz 11784 SHA256 eadfcd9d1663206f1d15457358afa7901f095894d782d4043ffd762b242eded6 SHA512 f8514ffc5079ba91448277365fadcec3f4ec949fdef8a5eebd1d529aaa73736721c405088eea363bbf5fc9cac6f8799ed329b53c5369e6acf93ac16eb8d2e7ac WHIRLPOOL 1a9fb503c921705d58ab89aa24495cb85cbd00df8ff6f2fd1f79750213759ee4d4856efe5bf7bd927eff3e250b2c06c0aec448d69fc974bc17a47fb67a49f8bc
 DIST evolution-2.32.3.tar.bz2 31966138 SHA256 33ab38780e9abb71506230e331e9c3534444b5ed3f17046f0b6371a00df686fb SHA512 7241954f4e6ab87151e2c4af0bd33d5f428ab5e01f935aafbfaf50714a495fe01fe54c3f3c6498d514880bf1c5271d491a523d79b2928827490204b9eee4c0d3 WHIRLPOOL 982ca39ff6c02adbd168a8c82a164636eaf908e0e4905195d321187199339a8e9725fa91b7d8d95b3ff5d32a9b7faf0a4a9da8d651915b4d1581788f722fb8c9
 DIST evolution-3.12.4.tar.xz 12135060 SHA256 4e52f46038a859179a2a20c13d2bf9ad6ea240f03ec9e54661f813b0582905a2 SHA512 1fd7479560a25d3b239457c18622ca0d9f1dac383aa51799abe77aac65fcc2812a4bdb21223b04da1554ec4255da833b3ff68cfce8990ed3363e432df649d59a WHIRLPOOL 1210e19a2d345d1361f89c9166751ccd5af503774eee2a313db94767cc6be55fcb816a87cd8926294cd855d6826ec464f25e59ec02f7f91b25cbee273d2fff87
-DIST evolution-3.12.6.tar.xz 11334980 SHA256 5f17a564a3c0351c1d0823551f80579ef611d51ab9db1e7f8d2ad7ed126bf76d SHA512 0f66157fdb3874291541e554c34fecb5c163fb7ba6fa64ad312fb8e642c364bbcbda7044804236eeac76b3b166933b971dac653811c492df6f9bfe3df21d108a WHIRLPOOL de1bda3da5657fac45f148da2283a44780880f82812931d9d493f195120a6f39ea53971cd460216619a431dd85c82cb001fe93dd2583ff1ddf8c9ec9267388b9
 DIST evolution-3.12.7.tar.xz 11325012 SHA256 77fdfe1a92edb514bf28e577ff46e5a4c22d16c389077eff23945b0feb650eb9 SHA512 f12d2bd520c68b9b6068db0d2c4e62292f537600471639b82bad316006ade6fcc9d3620d2d594ed6dd7348df7b6c0e748d87752325433404ec39b748827add64 WHIRLPOOL 61cc16a0a86ddab50a2e5f068213c8174ecef55e82369c9db98053b804c8db6f1adb8fc0d2ad4e706477b36db7dff7a6225af326c926e53134cf48e93b2eec40
+DIST evolution-3.12.8.tar.xz 11370556 SHA256 6a6996ed350e2bc09ecb63befdbc9cfbd9d1097e0ff77033e9bafd1f7b5a6414 SHA512 5f41ed843f478dbe7d66908369390c28b0fc67f616f21d1ea13b6d52491f4acaa7f933f3aa7cbf2a27e1b6e7c9fa244b7f456ab6b14714775289cd21f1a8b983 WHIRLPOOL c8d50bc2a8bf47e644b6b4b39617ff9a55ab22c2c2b968eee1237ec2222ccb40999053d247d3940a4c5214f89477535959e7f404e3ffc082f8f9b2bdc711b9c3
diff --git a/mail-client/evolution/evolution-3.12.6.ebuild b/mail-client/evolution/evolution-3.12.8.ebuild
similarity index 98%
rename from mail-client/evolution/evolution-3.12.6.ebuild
rename to mail-client/evolution/evolution-3.12.8.ebuild
index 0f0ce5a62337..74cc14ca5066 100644
--- a/mail-client/evolution/evolution-3.12.6.ebuild
+++ b/mail-client/evolution/evolution-3.12.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.6.ebuild,v 1.1 2014/09/24 13:25:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.8.ebuild,v 1.1 2014/11/11 11:42:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -53,7 +53,6 @@ COMMON_DEPEND="
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
 	map? (
-		>=app-misc/geoclue-0.12.0:0
 		>=media-libs/libchamplain-0.12:0.12[gtk]
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index a403c8f98d13..bad508cb32ad 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -2,3 +2,4 @@ DIST geary-0.6.3.tar.xz 791248 SHA256 2fa2612bf3821f8ff74664463a430729776f6f9bf3
 DIST geary-0.7.2.tar.xz 811104 SHA256 a121c808d41a735b1d36c04bca742014a35baec423ebcfb97e43fd7bd9767b30 SHA512 151f20f064d88bc9c29ecef81c7c5a4c373929ea245b28108e152a91c729c1cfcf78794db443ef08bc594d2980f427dce16ddf8a630c8a44ce4b6f7b456f4c57 WHIRLPOOL 2e24c06d26ddf45ab94652800b6c5ab77f1243fd942e973deb51a6cc78a572d519fd92502d4c6f3f4e273465787205539d92966d37362882fef660eb0199acb2
 DIST geary-0.8.0.tar.xz 820800 SHA256 4d4c168180d1c5193ba2784902f75b90b9c13d674204da4014e70d5bee14bd48 SHA512 52b41504a45057387d8b35f660781b861a2e8a899022531408ccc6cbc651d11055014447e56bdee092f4c2eeefc60cdd90cdbd828218666f43126a817909a985 WHIRLPOOL 65530823b8e3aabd002959172971a8f305d818cce7bd0d47b3ee77496de75e9ebd1adb321ab995229ea91cd317b294744414df635b6a3bdf63b91d569265d699
 DIST geary-0.8.1.tar.xz 827708 SHA256 9049b4b056ff89d2a2f6fa5438a7f2fcd623f6264b8b0d9568495752604e9e6f SHA512 7d099d10edfa3f20fe663126d1f2ce4a5afc3ace65ca4855f83c977195d7978be5bcc16ba6e6eaed50191df955308daf508fcd20663bfc63c8174089614f3de2 WHIRLPOOL 516a9c172f3fe18a5146e7e177f5f2aa080063bbfb05a5d7906913618d08d385ad5031b29779e678615be1837607425fbec64e5aa0add10ebb14d01218489191
+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.8.2.ebuild
new file mode 100644
index 000000000000..0486317114d0
--- /dev/null
+++ b/mail-client/geary/geary-0.8.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 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.1 2014/11/11 08:41:53 hasufell Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.22
+
+inherit eutils fdo-mime gnome2-utils 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/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+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"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	nls? ( virtual/libintl )"
+DEPEND="${DEPEND}
+	app-text/gnome-doc-utils
+	dev-util/desktop-file-utils
+	nls? ( sys-devel/gettext )
+	$(vala_depend)
+	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
+
+	local i
+	if use nls ; then
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in $(cd po ; echo *.po) ; do
+				if ! has ${i%.po} ${LINGUAS} ; then
+					sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
+				fi
+			done
+		fi
+	else
+		sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDESKTOP_UPDATE=OFF
+		-DGSETTINGS_COMPILE=OFF
+		-DICON_UPDATE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DWITH_UNITY=OFF
+		-DDESKTOP_VALIDATE=OFF
+	)
+
+	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/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild
index dd35a53d671e..f75d843e0805 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild,v 1.7 2014/11/10 10:52:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild,v 1.8 2014/11/11 10:52:34 ago Exp $
 
 EAPI="5"
 
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-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"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/ufraw/ufraw-0.20-r1.ebuild b/media-gfx/ufraw/ufraw-0.20-r1.ebuild
index 6d12273b6cb3..8980a37a8402 100644
--- a/media-gfx/ufraw/ufraw-0.20-r1.ebuild
+++ b/media-gfx/ufraw/ufraw-0.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.20-r1.ebuild,v 1.1 2014/11/05 18:19:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.20-r1.ebuild,v 1.2 2014/11/11 10:48:32 ago Exp $
 
 EAPI=5
 inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
@@ -11,7 +11,7 @@ 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"
+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"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-libs/adplug/adplug-2.2.1.ebuild b/media-libs/adplug/adplug-2.2.1.ebuild
index ecc0d3442332..5649d57b44c1 100644
--- a/media-libs/adplug/adplug-2.2.1.ebuild
+++ b/media-libs/adplug/adplug-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/adplug-2.2.1.ebuild,v 1.12 2014/05/07 18:04:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/adplug/adplug-2.2.1.ebuild,v 1.13 2014/11/11 11:25:26 blueness Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc x86"
+KEYWORDS="amd64 arm hppa ppc ~ppc64 x86"
 IUSE="debug static-libs"
 
 RDEPEND=">=dev-cpp/libbinio-1.4"
diff --git a/media-sound/mpd/mpd-0.19.1.ebuild b/media-sound/mpd/mpd-0.19.1.ebuild
index 4b614d1b3e48..bb02deb5fc5c 100644
--- a/media-sound/mpd/mpd-0.19.1.ebuild
+++ b/media-sound/mpd/mpd-0.19.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.1.ebuild,v 1.6 2014/11/02 11:59:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.1.ebuild,v 1.7 2014/11/11 11:27:41 blueness Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~sh ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
 	flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
 	libmpdclient libsamplerate libsoxr +mad mikmod modplug mp4v2 mpg123 musepack
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
index c1b8c5d81380..cb8f7f750759 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild,v 1.4 2014/11/10 11:19:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild,v 1.5 2014/11/11 10:51:58 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
 RDEPEND=">=media-libs/libvorbis-1.3.0
diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild
index 201ca8d927b2..2a88e33abb39 100644
--- a/media-video/lsdvd/lsdvd-0.17.ebuild
+++ b/media-video/lsdvd/lsdvd-0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.17.ebuild,v 1.2 2014/11/10 11:18:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lsdvd/lsdvd-0.17.ebuild,v 1.3 2014/11/11 10:49:49 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lsdvd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="media-libs/libdvdread"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f2223e178a3b..853d0dc4535b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Nov 2014 06:07:01 +0000
+Tue, 11 Nov 2014 12:07:04 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f2223e178a3b..fb3301b725b7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Nov 2014 06:07:01 +0000
+Tue, 11 Nov 2014 12:07:05 +0000
diff --git a/metadata/md5-cache/app-admin/pwgen-2.07 b/metadata/md5-cache/app-admin/pwgen-2.07
index cf202890c6d2..0a338cdc59d6 100644
--- a/metadata/md5-cache/app-admin/pwgen-2.07
+++ b/metadata/md5-cache/app-admin/pwgen-2.07
@@ -3,9 +3,9 @@ DESCRIPTION=Password Generator
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pwgen/
 IUSE=livecd
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-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-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pwgen/pwgen-2.07.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2c1960105ca0bb89c8393f03315214e6
+_md5_=6211001efe7a9434807ab58ba571c081
diff --git a/metadata/md5-cache/app-backup/deja-dup-30.0 b/metadata/md5-cache/app-backup/deja-dup-30.0
index 384092d3707e..2b445baf87c5 100644
--- a/metadata/md5-cache/app-backup/deja-dup-30.0
+++ b/metadata/md5-cache/app-backup/deja-dup-30.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/30/30.0/+download/deja-dup-30.0.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=31e225e9b834a68b7ec3e1467db72905
diff --git a/metadata/md5-cache/app-backup/deja-dup-32.0 b/metadata/md5-cache/app-backup/deja-dup-32.0
index 2952c07258d2..8b5c5d4ff5ad 100644
--- a/metadata/md5-cache/app-backup/deja-dup-32.0
+++ b/metadata/md5-cache/app-backup/deja-dup-32.0
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/32/32.0/+download/deja-dup-32.0.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ee637f8f56f47b020c1a6fba4132764a
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 450e2c872edf..89eb37c3eb61 100644
--- a/metadata/md5-cache/app-backup/deja-dup-32.0-r1
+++ b/metadata/md5-cache/app-backup/deja-dup-32.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/32/32.0/+download/deja-dup-32.0.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=890c593cc307fdcf49a9da4cd2b51d15
diff --git a/metadata/md5-cache/app-crypt/gcr-3.10.1 b/metadata/md5-cache/app-crypt/gcr-3.10.1
index cefdb178017a..81384bdd455e 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.10.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.10.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.32:2 >=de
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.10/gcr-3.10.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d50a10465271e5f12f6337821f5c09b1
diff --git a/metadata/md5-cache/app-crypt/gcr-3.12.2 b/metadata/md5-cache/app-crypt/gcr-3.12.2
index 173701bd6194..cb2bd66aa221 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.12.2
+++ b/metadata/md5-cache/app-crypt/gcr-3.12.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.34:2 >=de
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.12/gcr-3.12.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6230472b976464395a64dc068876d025
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.16 b/metadata/md5-cache/app-crypt/libsecret-0.16
index 5573bc56f3cd..671ade1b5b25 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.16
+++ b/metadata/md5-cache/app-crypt/libsecret-0.16
@@ -1,5 +1,5 @@
 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.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+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.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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32.0:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) intros
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.16/libsecret-0.16.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a77022571cbe3e057e8c9dd9f43160c9
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18 b/metadata/md5-cache/app-crypt/libsecret-0.18
index e2c35d7b137b..c4beeb67200c 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.38: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-1.9 >=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.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.38: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-1.9 >=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.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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspe
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=97ae70f6065fa96176f87d8afaebf27a
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.13 b/metadata/md5-cache/app-crypt/mit-krb5-1.13
index d872b0399253..25f50ad3c501 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.13
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.13
@@ -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-signed.tar
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0ba195990b5efa1cba938c1c57d39c4c
+_md5_=a96d20baa4a6122ace318d1f689d7987
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1 b/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1
index 9f811d9da601..e6ad4ca8a35b 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.10.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-crypt/gcr-3.9.1:= >=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* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6:= ) ldap? ( net-nds/openldap:= ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-crypt/gcr[vala] >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-crypt/gcr-3.9.1:= >=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* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6:= ) ldap? ( net-nds/openldap:= ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-crypt/gcr[vala] >=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
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=app-crypt/gcr-3.9.1:= >=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* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6:= ) ldap? ( net-nds/openldap:= ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.10/seahorse-3.10.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2d7f167c1544d124e48fce9d49cc6fe
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r2 b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
index 2d9179b1800c..27ad1905e55a 100644
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r2
+++ b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Generate or check digests or MACs of files
 EAPI=5
 HOMEPAGE=http://mcrypt.hellug.gr/shash/
 IUSE=static
-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 ~x86-linux ~ppc-macos
+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 ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/mhash-0.8.18-r1
 SLOT=0
 SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a74730f1b29367d51d4ab0af47d49929
+_md5_=83abcfd5e7b6bbe8622b3cab65f21743
diff --git a/metadata/md5-cache/app-editors/latexila-2.10.1 b/metadata/md5-cache/app-editors/latexila-2.10.1
index 54b7871e56a4..035ffed554c8 100644
--- a/metadata/md5-cache/app-editors/latexila-2.10.1
+++ b/metadata/md5-cache/app-editors/latexila-2.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/enchant >=app-text/gtkspell-3.0.4:3 >=dev-libs/glib-2.36:2 dev-libs/libgee:0 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6.0:3 >=x11-libs/gtksourceview-3.10.0:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/2.10/latexila-2.10.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f8c0f746673612adb5910dea341c56b
diff --git a/metadata/md5-cache/app-editors/latexila-2.12.1 b/metadata/md5-cache/app-editors/latexila-2.12.1
index ef5e8ba9d7cf..7e003f15cfd1 100644
--- a/metadata/md5-cache/app-editors/latexila-2.12.1
+++ b/metadata/md5-cache/app-editors/latexila-2.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/enchant >=app-text/gtkspell-3.0.4:3 >=dev-libs/glib-2.40:2 dev-libs/libgee:0 gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6.0:3 >=x11-libs/gtksourceview-3.10.0:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/2.12/latexila-2.12.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=66993e530047f9c21b2245da75fb2ca2
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.1.2 b/metadata/md5-cache/app-emacs/python-mode-6.1.2
index 9bbe7923a45b..f0fefa16a463 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.1.2
+++ b/metadata/md5-cache/app-emacs/python-mode-6.1.2
@@ -3,10 +3,10 @@ DEPEND=>=virtual/emacs-23
 DESCRIPTION=An Emacs major mode for editing Python source
 EAPI=5
 HOMEPAGE=https://launchpad.net/python-mode
-KEYWORDS=amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://launchpad.net/python-mode/trunk/6.1.2/+download/python-mode.el-6.1.2.tar.gz
 _eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9eb88e3f19765f9065273be2e8acb6de
+_md5_=8cc2b5f253af368800e4906f06cc0408
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7 b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7
deleted file mode 100644
index b5b94f080ad1..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.10:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=GLib and GObject mappings for libvirt
-EAPI=5
-HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
-IUSE=+introspection python +vala python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.10:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-0.1.7.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9acde139644f4f2e668d5308d8ea927d
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8 b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8
index 5900ce06415b..af36e1344598 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GLib and GObject mappings for libvirt
 EAPI=5
 HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-0.1.8.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f8c1cfcfa69a90182d7b80e8b218c5c
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-0.1.9 b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.9
new file mode 100644
index 000000000000..ade84ee2de72
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-0.1.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GLib and GObject mappings for libvirt
+EAPI=5
+HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
+IUSE=+introspection python +vala python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-0.9.10:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 ) vala? ( introspection )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-0.1.9.tar.gz
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=156e2bbd80e66eb2efb39a871bd944ba
diff --git a/metadata/md5-cache/app-i18n/ibus-1.4.1 b/metadata/md5-cache/app-i18n/ibus-1.4.1
index 34127278d53e..041adb9f6647 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.4.1
+++ b/metadata/md5-cache/app-i18n/ibus-1.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ibus/
 IUSE=dconf doc +gconf gtk gtk3 +introspection nls +python vala +X
 KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 REQUIRED_USE=|| ( gtk gtk3 X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.4.1.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=f15e18eb8dbe0438f785617b014ae5a1
diff --git a/metadata/md5-cache/app-i18n/ibus-1.4.2 b/metadata/md5-cache/app-i18n/ibus-1.4.2
index e9c377a5f191..7e051aac5c6a 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.4.2
+++ b/metadata/md5-cache/app-i18n/ibus-1.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) >=dev-lang/perl-5.8.1 dev-util/intltool virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=4
 HOMEPAGE=http://code.google.com/p/ibus/
 IUSE=dconf doc +gconf gtk gtk3 +introspection nls +python vala +X
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+RDEPEND=>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) x11-apps/setxkbmap python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 REQUIRED_USE=|| ( gtk gtk3 X )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.4.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=2e70267dc9be810157b827e1ae7bfe42
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.5 b/metadata/md5-cache/app-i18n/ibus-1.5.5
index fc40175c5a9e..21ab68fe5750 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.5
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=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:=[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_2(-),-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 ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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:=[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_2(-),-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 ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) python? ( python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ibus.googlecode.com/files/ibus-1.5.5.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bdcb98bf52c8f7a4c3af6fbe6386ed1a
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.8-r1 b/metadata/md5-cache/app-i18n/ibus-1.5.8-r1
index 3ea0b1f60c4a..a0a143f34a79 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.8-r1
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=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:=[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_2(-),-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 ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=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:=[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_2(-),-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 ) >=dev-lang/perl-5.8.1 dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.16.1 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) gnome-base/gconf >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) python? ( python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.8/ibus-1.5.8.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e75dbfd5334be5bef7571535db3d7719
diff --git a/metadata/md5-cache/app-i18n/libskk-0.0.11 b/metadata/md5-cache/app-i18n/libskk-0.0.11
index fdac976a3300..2e67785a26bd 100644
--- a/metadata/md5-cache/app-i18n/libskk-0.0.11
+++ b/metadata/md5-cache/app-i18n/libskk-0.0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=4
 HOMEPAGE=https://github.com/ueno/libskk
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://github/ueno/libskk/libskk-0.0.11.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2bc6000c555a005c770ee4e1138ec0fd
diff --git a/metadata/md5-cache/app-i18n/libskk-0.0.12 b/metadata/md5-cache/app-i18n/libskk-0.0.12
index 3043eead5502..c2a116a0d94f 100644
--- a/metadata/md5-cache/app-i18n/libskk-0.0.12
+++ b/metadata/md5-cache/app-i18n/libskk-0.0.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=4
 HOMEPAGE=https://github.com/ueno/libskk
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://github/ueno/libskk/libskk-0.0.12.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=273a90f794466232e20a6b4354d029fc
diff --git a/metadata/md5-cache/app-i18n/libskk-0.0.9 b/metadata/md5-cache/app-i18n/libskk-0.0.9
index 80b05a485312..f53eec47cec6 100644
--- a/metadata/md5-cache/app-i18n/libskk-0.0.9
+++ b/metadata/md5-cache/app-i18n/libskk-0.0.9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=4
 HOMEPAGE=https://github.com/ueno/libskk
 IUSE=nls static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) nls? ( virtual/libintl )
+RDEPEND=dev-libs/glib dev-libs/libgee:0 dev-libs/json-glib >=dev-libs/gobject-introspection-0.9 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://github/ueno/libskk/libskk-0.0.9.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=59bc16c9cb2608e04c329af1fee8c8fc
diff --git a/metadata/md5-cache/app-i18n/libskk-1.0.1 b/metadata/md5-cache/app-i18n/libskk-1.0.1
index 1fd294802458..1e2f26d28b65 100644
--- a/metadata/md5-cache/app-i18n/libskk-1.0.1
+++ b/metadata/md5-cache/app-i18n/libskk-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GObject-based library to deal with Japanese kana-to-kanji conversion method
 EAPI=5
 HOMEPAGE=https://github.com/ueno/libskk
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16 dev-libs/libgee:0 dev-libs/json-glib introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/libskk/libskk/downloads/libskk-1.0.1.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=479b7c44ada708a27d1b21849d3148b1
diff --git a/metadata/md5-cache/app-i18n/man-pages-de-1.7 b/metadata/md5-cache/app-i18n/man-pages-de-1.7
index c45440e60d2d..e022e1032f48 100644
--- a/metadata/md5-cache/app-i18n/man-pages-de-1.7
+++ b/metadata/md5-cache/app-i18n/man-pages-de-1.7
@@ -3,10 +3,10 @@ DEPEND=virtual/man app-text/po4a !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-deve
 DESCRIPTION=A somewhat comprehensive collection of Linux german man page translations
 EAPI=5
 HOMEPAGE=http://alioth.debian.org/projects/manpages-de/
-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+ man-pages GPL-2+ GPL-2 BSD
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=http://manpages-de.alioth.debian.org/downloads/manpages-de-1.7.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=36f457c644b66e87a867fb88c86437c4
+_md5_=69248a40e0036ff3c3cb844677623db8
diff --git a/metadata/md5-cache/app-misc/devtodo-0.1.20-r2 b/metadata/md5-cache/app-misc/devtodo-0.1.20-r2
index ca9921076b95..0829fe70aba9 100644
--- a/metadata/md5-cache/app-misc/devtodo-0.1.20-r2
+++ b/metadata/md5-cache/app-misc/devtodo-0.1.20-r2
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 !<sys-devel/gettext-0.18.1
 DESCRIPTION=A nice command line todo list for developers
 EAPI=5
 HOMEPAGE=http://swapoff.org/DevTodo
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1
 SLOT=0
 SRC_URI=http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a13f96b374e9fc7baeb15e3131e309fc
+_md5_=d5aa49a56bb7426bf9262911b1db14ec
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.2 b/metadata/md5-cache/app-misc/tracker-1.0.2
index 93f2a3416d9b..8bfbc3de1d7f 100644
--- a/metadata/md5-cache/app-misc/tracker-1.0.2
+++ b/metadata/md5-cache/app-misc/tracker-1.0.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=de
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=cb2f41aff9a121dd0904374da42718f6
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.5 b/metadata/md5-cache/app-misc/tracker-1.0.5
index 4dcb31a51031..50d41013e00d 100644
--- a/metadata/md5-cache/app-misc/tracker-1.0.5
+++ b/metadata/md5-cache/app-misc/tracker-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
@@ -11,5 +11,5 @@ RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=de
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.5.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=baa9dfc6e45e253f773bc0deedd2e136
diff --git a/metadata/md5-cache/app-misc/tracker-1.0.4 b/metadata/md5-cache/app-misc/tracker-1.0.6
similarity index 87%
rename from metadata/md5-cache/app-misc/tracker-1.0.4
rename to metadata/md5-cache/app-misc/tracker-1.0.6
index 10f37b8e13ac..f4585947b8d9 100644
--- a/metadata/md5-cache/app-misc/tracker-1.0.4
+++ b/metadata/md5-cache/app-misc/tracker-1.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/gtk-doc-am-1.8 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig gtk? ( >=dev-libs/libgee-0.3 ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.0.4 )
+PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.0.6 )
 RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-0.1:1.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( >=virtual/ffmpeg-9 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( net-libs/libgrss:0.5 ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
 REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
 SLOT=0/100
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.4.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=412c71929c0b85970613f260e4c97411
+SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.6.tar.xz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=3695310ffd62f760eb8fd994fb61d1cd
diff --git a/metadata/md5-cache/app-office/glabels-3.2.1 b/metadata/md5-cache/app-office/glabels-3.2.1
new file mode 100644
index 000000000000..d0c478c2227b
--- /dev/null
+++ b/metadata/md5-cache/app-office/glabels-3.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.28.2:2 >=x11-libs/gtk+-3.0.9:3 >=dev-libs/libxml2-2.7.8:2 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/cairo-1.10.0 >=x11-libs/pango-1.28.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-2.30.3 ) app-text/scrollkeeper app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.28 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Program for creating labels and business cards
+EAPI=5
+HOMEPAGE=http://www.glabels.org/
+IUSE=barcode eds
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2 FDL-1.1 LGPL-2
+RDEPEND=>=dev-libs/glib-2.28.2:2 >=x11-libs/gtk+-3.0.9:3 >=dev-libs/libxml2-2.7.8:2 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/cairo-1.10.0 >=x11-libs/pango-1.28.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-2.30.3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glabels/3.2/glabels-3.2.1.tar.xz
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=4821157fe3646530731ac47b7b969506
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.4 b/metadata/md5-cache/app-text/gtkspell-3.0.4
index 47d1f8053177..2736b85b6c10 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.4
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Spell checking widget for GTK
 EAPI=5
 HOMEPAGE=http://gtkspell.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.4/gtkspell3-3.0.4.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21397a72a37222c9c0ed17ed4b53b461
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.18 b/metadata/md5-cache/app-text/xapian-omega-1.2.18
index c209855c3ce7..d52f6c71eaac 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.18
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.18
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/xapian-1.2.18 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.2.18 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.18/xapian-omega-1.2.18.tar.xz
-_md5_=f6165047e61c9a79d04fbf3325be9bd1
+_md5_=eafddbf97e35a8b5d39f41f99b0e2c30
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1
index 79e1c9317f31..f56e6c546f0b 100644
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Gentoo MySQL init scripts
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<dev-db/mysql-5.1
 SLOT=0
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ea28b38f3d99bac9e0dda4afa74cfa45
+_md5_=13778ba43ade103ce7ef8ec4570cf5a5
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p550 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p550
index 1f19403f199d..c57de2e48941 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p550
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p550
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=virtual/rubygems:ruby19 rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p550.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p550.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=92fe8bc3d936da53b407b5e36994cf85
+_md5_=1d2b002af61cf2c987feb464768e4947
diff --git a/metadata/md5-cache/dev-lang/ruby-2.0.0_p594 b/metadata/md5-cache/dev-lang/ruby-2.0.0_p594
index 42bc1cb39345..87d692fea2f5 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.0.0_p594
+++ b/metadata/md5-cache/dev-lang/ruby-2.0.0_p594
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=virtual/rubygems:ruby20 >=dev-ruby/json-1.7.7[ruby_targets_ruby20] >=dev-ruby/rake-0.9.6[ruby_targets_ruby20] rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.0
 SRC_URI=mirror://ruby/2.0/ruby-2.0.0-p594.tar.xz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.0.0_p594.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3933576d665e8cddbb5cab77c10c183e
+_md5_=0164821dceda2413a67da4d1870298f7
diff --git a/metadata/md5-cache/dev-libs/dee-1.0.14-r2 b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
index 82ef43c0b506..68b603325f2c 100644
--- a/metadata/md5-cache/dev-libs/dee-1.0.14-r2
+++ b/metadata/md5-cache/dev-libs/dee-1.0.14-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) doc? ( dev-util/gtk-doc ) test? ( dev-libs/gtx dev-util/dbus-test-runner ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Provide objects allowing to create Model-View-Controller type programs across DBus
 EAPI=5
 HOMEPAGE=https://launchpad.net/dee/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/icu:= introspection? ( python_targets_python2_7
 REQUIRED_USE=introspection? ( || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) )
 SLOT=0
 SRC_URI=https://launchpad.net/dee/1.0/1.0.14/+download/dee-1.0.14.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=8af6b3ca435f554e2d3d96c40fbdda39
diff --git a/metadata/md5-cache/dev-libs/folks-0.10.0 b/metadata/md5-cache/dev-libs/folks-0.10.0
index f39b77290aab..b8a9138187b3 100644
--- a/metadata/md5-cache/dev-libs/folks-0.10.0
+++ b/metadata/md5-cache/dev-libs/folks-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] ) >=dev-lib
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.10/folks-0.10.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=64dd93d1f9b644cffb4da2f4cefe894f
diff --git a/metadata/md5-cache/dev-libs/folks-0.4.3 b/metadata/md5-cache/dev-libs/folks-0.4.3
index 65b29a621182..66d0d72c404e 100644
--- a/metadata/md5-cache/dev-libs/folks-0.4.3
+++ b/metadata/md5-cache/dev-libs/folks-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.24:2 >=net-libs/telepathy-glib-0.13.1[vala] dev-libs/dbus-glib <dev-libs/libgee-0.7:0 dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-util/intltool-0.35.0 virtual/pkgconfig >=dev-libs/gobject-introspection-0.9.12 sys-devel/gettext >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.24:2 >=net-libs/telepathy-glib-0.13.1[vala] dev-libs/dbus-glib <dev-libs/libgee-0.7:0 dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:= || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=dev-util/intltool-0.35.0 virtual/pkgconfig >=dev-libs/gobject-introspection-0.9.12 sys-devel/gettext >=sys-apps/sed-4
 DESCRIPTION=libfolks is a library that aggregates people from multiple sources
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org/wiki/Folks
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=net-libs/telepathy-glib-0.13.1[vala] dev-libs/dbus-glib <dev-libs/libgee-0.7:0 dev-libs/libxml2 sys-libs/ncurses:= sys-libs/readline:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/folks/0.4/folks-0.4.3.tar.bz2
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=24a9b4122c4a31baaea6f0d99011b0a3
diff --git a/metadata/md5-cache/dev-libs/folks-0.9.7.1 b/metadata/md5-cache/dev-libs/folks-0.9.7.1
index 297d16a6b0b2..ddb7f53e740c 100644
--- a/metadata/md5-cache/dev-libs/folks-0.9.7.1
+++ b/metadata/md5-cache/dev-libs/folks-0.9.7.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] ) >=dev-lib
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.9/folks-0.9.7.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9c25d0f84839dcaa526769c59017c9ab
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.19-r1 b/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
index 214387cacbb0..f34cc0cfd0e7 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.19-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=5
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.19.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e7e4fe8d8a7b1118b0432fd2b65524d4
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.20 b/metadata/md5-cache/dev-libs/gmime-2.6.20
index c777bbab2744..b683e3ef6194 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.20
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.20
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=dev-libs/gobject-introspection-1.30.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Utilities for creating and parsing messages using MIME
 EAPI=5
 HOMEPAGE=http://spruce.sourceforge.net/gmime/ http://developer.gnome.org/gmime/stable/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib >=app-crypt/gpgme-1.1.6 mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 )
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.20.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b37fe649f5aab5849946650587099594
diff --git a/metadata/md5-cache/dev-libs/granite-0.1.0 b/metadata/md5-cache/dev-libs/granite-0.1.0
index c9a12edf4ee0..0559bb49e45c 100644
--- a/metadata/md5-cache/dev-libs/granite-0.1.0
+++ b/metadata/md5-cache/dev-libs/granite-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A development library for elementary development
 EAPI=4
 HOMEPAGE=http://launchpad.net/granite
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.x/0.1/+download/granite-0.1.0.tar.gz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=e0db87b206979d1f4818e4faa010ebf9
diff --git a/metadata/md5-cache/dev-libs/granite-0.2.1 b/metadata/md5-cache/dev-libs/granite-0.2.1
index 0c7355b12123..4dc3e9e32cfa 100644
--- a/metadata/md5-cache/dev-libs/granite-0.2.1
+++ b/metadata/md5-cache/dev-libs/granite-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig sys-devel/gettext 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
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.2/0.2.1/+download/granite-0.2.1.tar.gz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca45f5075870376423acbf2c5beab77c
diff --git a/metadata/md5-cache/dev-libs/granite-0.2.3.1 b/metadata/md5-cache/dev-libs/granite-0.2.3.1
index 64e8c6c4781b..3679fa3edc0c 100644
--- a/metadata/md5-cache/dev-libs/granite-0.2.3.1
+++ b/metadata/md5-cache/dev-libs/granite-0.2.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.32 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] >=x11-libs/gtk+-3.3.14:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) 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
+DEPEND=>=dev-libs/glib-2.32 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] >=x11-libs/gtk+-3.3.14:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) 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
@@ -8,5 +8,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.32 dev-libs/gobject-introspection dev-libs/libgee:0[introspection] >=x11-libs/gtk+-3.3.14:3
 SLOT=0
 SRC_URI=http://launchpad.net/granite/0.2/0.2.3.1/+download/granite-0.2.3.1.tgz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef38db30774b053aa9f22f9adfbaeae6
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0
index 55fd6384a53e..b44039188506 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1 ) virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 introspection? ( >=dev-libs/gobject-introspection-1 ) virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
 EAPI=4
 HOMEPAGE=http://launchpad.net/libappindicator
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.26 >=dev-libs/libdbusmenu-0.6.2:3[gtk] >=dev-libs/libindicator-12.10.0:3 >=x11-libs/gtk+-3.2:3 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_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=6300a019373162a37e80c453cbdb5459
diff --git a/metadata/md5-cache/dev-libs/libdaemon-0.14-r2 b/metadata/md5-cache/dev-libs/libdaemon-0.14-r2
index 33d8a0e98c45..b40b7303693d 100644
--- a/metadata/md5-cache/dev-libs/libdaemon-0.14-r2
+++ b/metadata/md5-cache/dev-libs/libdaemon-0.14-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Simple library for creating daemon processes in C
 EAPI=5
 HOMEPAGE=http://0pointer.de/lennart/projects/libdaemon/
 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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e8548574679a8c593105de5370e5a940
+_md5_=026e9cdc1f774909f2f25c3d14001dae
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2 b/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
index f5bf3a366c29..77a8df6924d8 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=Library to pass menu structure across DBus
 EAPI=4
 HOMEPAGE=http://launchpad.net/dbusmenu
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/glib-2.32 >=dev-libs/dbus-glib-0.100 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200
 SLOT=3
 SRC_URI=http://launchpad.net/dbusmenu/0.6/0.6.2/+download/libdbusmenu-0.6.2.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=a676e3bed275881890dc878387ca271a
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2 b/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2
index 45057030fdb5..3ee30dc4b714 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup test
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/json-glib-0.13.4 >=dev-libs/glib-2.32 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/json-glib-0.13.4 >=dev-libs/glib-2.32 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=Library to pass menu structure across DBus
 EAPI=5
 HOMEPAGE=http://launchpad.net/dbusmenu
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/json-glib-0.13.4 >=dev-libs/glib-2.32 dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200
 SLOT=3
 SRC_URI=http://launchpad.net/dbusmenu/12.10/12.10.2/+download/libdbusmenu-12.10.2.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=b88dea9c40a62d8cc25af591ff6429e4
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.14.3 b/metadata/md5-cache/dev-libs/libgdata-0.14.3
index 925fd0c6febd..a37c2a40b2ea 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.14.3
+++ b/metadata/md5-cache/dev-libs/libgdata-0.14.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 SLOT=0/13
 SRC_URI=mirror://gnome/sources/libgdata/0.14/libgdata-0.14.3.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f870744529f9ad139e3f9561fd452d1a
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.16.0 b/metadata/md5-cache/dev-libs/libgdata-0.16.0
index 3277a7ecad0f..7625d740378c 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.16.0
+++ b/metadata/md5-cache/dev-libs/libgdata-0.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] net-libs/uhttpmock >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 SLOT=0/19
 SRC_URI=mirror://gnome/sources/libgdata/0.16/libgdata-0.16.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a34be34543bf1e262c8e793e45041f91
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.16.1 b/metadata/md5-cache/dev-libs/libgdata-0.16.1
new file mode 100644
index 000000000000..f8d46d23a69f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgdata-0.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40 >=gnome-base/gnome-common-3.6 virtual/pkgconfig test? ( net-libs/uhttpmock ) vala? ( || ( 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
+DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
+IUSE=gnome +introspection static-libs test vala debug
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 gnome? ( app-crypt/gcr:= >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+SLOT=0/19
+SRC_URI=mirror://gnome/sources/libgdata/0.16/libgdata-0.16.1.tar.xz
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=5a5092d6e0767b50d1f33db51abf5d0f
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.1.6 b/metadata/md5-cache/dev-libs/libgusb-0.1.6
index c1a848e39a96..96a43befd45f 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.1.6
+++ b/metadata/md5-cache/dev-libs/libgusb-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.28:2 virtual/libusb:1 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-1.29 ) app-arch/xz-utils dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-libs/glib-2.28:2 virtual/libusb:1 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-1.29 ) app-arch/xz-utils dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=GObject wrapper for libusb
 EAPI=5
 HOMEPAGE=https://gitorious.org/gusb/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hughsient/releases/libgusb-0.1.6.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=51a563d1f52f43a620914cc6dabe7f55
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.12.2-r1 b/metadata/md5-cache/dev-libs/libgweather-3.12.2-r1
index 7d1540fb9d5c..2ecf3cac18be 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.12.2-r1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.12.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-3.5.6:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-3.5.6:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( 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
 DESCRIPTION=Library to access weather information from online services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.5.6:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-l
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.12/libgweather-3.12.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=558119550ed9e6c6688dcc8d0b5aaac4
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.12.3 b/metadata/md5-cache/dev-libs/libgweather-3.12.3
index d5d1b29e00fc..f65621b6a776 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.12.3
+++ b/metadata/md5-cache/dev-libs/libgweather-3.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-3.5.6:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=x11-libs/gtk+-3.5.6:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.18 virtual/pkgconfig vala? ( || ( 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
 DESCRIPTION=Library to access weather information from online services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gtk+-3.5.6:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-l
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.12/libgweather-3.12.3.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fdb4325a8bd05565cbb761a35cb71be1
diff --git a/metadata/md5-cache/dev-libs/libindicate-12.10.1 b/metadata/md5-cache/dev-libs/libindicate-12.10.1
index 7e1493a02459..432123a33df3 100644
--- a/metadata/md5-cache/dev-libs/libindicate-12.10.1
+++ b/metadata/md5-cache/dev-libs/libindicate-12.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) app-text/gnome-doc-utils virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0.6.2:3[gtk?,introspection?] dev-libs/libxml2 gtk? ( >=x11-libs/gtk+-3.2:3 ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libindicate-0.6.1-r201 dev-util/gtk-doc-am gnome-base/gnome-common || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) app-text/gnome-doc-utils virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=A library to raise flags on DBus for other components of the desktop to pick up and visualize
 EAPI=5
 HOMEPAGE=http://launchpad.net/libindicate
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libdbusmenu-0
 RESTRICT=test
 SLOT=3
 SRC_URI=http://launchpad.net/libindicate/12.10/12.10.1/+download/libindicate-12.10.1.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=348987d683e862c4bc5976c9eda1480f
diff --git a/metadata/md5-cache/dev-libs/pakchois-0.4-r2 b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
index 8d4d3d3bf82e..c39ed9289eb0 100644
--- a/metadata/md5-cache/dev-libs/pakchois-0.4-r2
+++ b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
@@ -3,9 +3,9 @@ DESCRIPTION=PaKChoiS - PKCS #11 wrapper library
 EAPI=5
 HOMEPAGE=http://www.manyfish.co.uk/pakchois/
 IUSE=nls abi_x86_32 abi_x86_64 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 ~s390 ~sh sparc x86
+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	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=645f338090a390b81393cddb061980e7
+_md5_=0d5535319e4b513ae949800f68c5b85f
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.18 b/metadata/md5-cache/dev-libs/xapian-1.2.18
index c975479d299b..02e8c19d5fb0 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.18
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.18
@@ -4,9 +4,9 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -sse +sse2 +brass +chert +inmemory
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.18/xapian-core-1.2.18.tar.xz
-_md5_=09987a5cdbab192b31d8a5ba2a9bc672
+_md5_=367f40859c60b5f0163dd18000ff2ecf
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.18 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.18
index 6428214e49bb..0503130bdb71 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.18
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.18
@@ -4,11 +4,11 @@ DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=java lua perl php python ruby tcl elibc_FreeBSD java php_targets_php5-4 python_targets_python2_7 python_targets_python3_2
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND==dev-libs/xapian-1.2.18* lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( php_targets_php5-4? ( dev-lang/php:5.4 ) )
 REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-4 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.18/xapian-bindings-1.2.18.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	php-ext-source-r2	39437168059a2166e012420b3ba12815	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6223f4832f5b939a6814c4a9d91610bd
+_md5_=252cb1adbf2f68063823e469e40178dd
diff --git a/metadata/md5-cache/dev-perl/Class-Load-XS-0.60.0-r1 b/metadata/md5-cache/dev-perl/Class-Load-XS-0.60.0-r1
index 486c3c95b7ae..782cfb3b8323 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-XS-0.60.0-r1
+++ b/metadata/md5-cache/dev-perl/Class-Load-XS-0.60.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=XS implementation of parts of Class::Load
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Class-Load-XS/
 IUSE=test
-KEYWORDS=amd64 ~arm ppc x86 ~x64-macos
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~x64-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Class-Load-0.200.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Class-Load-XS-0.06.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=b8e9b468e22d8f93f3167ab95fbd63de
+_md5_=715d44fd91e652d22df2b99f622b6105
diff --git a/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1 b/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1
index f4997fd0359d..5f266712ab9d 100644
--- a/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-StackTrace-1.300.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Devel-StackTrace module for perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Devel-StackTrace/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Artistic-2
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.30.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=4ff927ec6cf15d6846fe43b06f25454f
+_md5_=76600085fbfc702fe52c02c3c84552eb
diff --git a/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1 b/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
index dfb85251301a..accc8e392791 100644
--- a/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
+++ b/metadata/md5-cache/dev-perl/Exception-Class-1.370.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-1.20
 DESCRIPTION=A module that allows you to declare real exception classes in Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Exception-Class/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Devel-StackTrace-1.200.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.37.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=39e8a118c945cb9e9cf055218598df9b
+_md5_=241cff873b5a09f3d4e9a5e28f783106
diff --git a/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1 b/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
index 6820d71533d3..819b5b53ae96 100644
--- a/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
+++ b/metadata/md5-cache/dev-perl/File-pushd-1.3.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Change directory temporarily for a limited scope
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/File-pushd/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.003.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=260e11f42a7411c71f2ff7a9aae0db05
+_md5_=e1dc6556a4c91a6684b2995046c254e6
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4 b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
index dda663bfcc71..5c6dae1228c4 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
+++ b/metadata/md5-cache/dev-perl/LaTeX-Driver-0.200.4
@@ -4,10 +4,10 @@ DESCRIPTION=Perl encapsulation of invoking the Latex programs
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Driver/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=dev-perl/Class-Accessor dev-perl/Exception-Class dev-perl/File-Slurp virtual/perl-File-Spec dev-perl/File-pushd virtual/perl-Getopt-Long dev-perl/Readonly virtual/perl-parent dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Driver-0.200.4.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=a9286498e4560b8eb078859cf2ecab56
+_md5_=2cd5c8e7329997d7651a18187a25fc63
diff --git a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6 b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
index 05eb6389a9c2..27071e23d011 100644
--- a/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
+++ b/metadata/md5-cache/dev-perl/LaTeX-Encode-0.91.6
@@ -4,10 +4,10 @@ DESCRIPTION=Encode characters for LaTeX formatting
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/LaTeX-Encode/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Getopt-Long dev-perl/HTML-Parser dev-perl/Pod-LaTeX dev-perl/Readonly dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EI/EINHVERFR/LaTeX-Encode-0.091.6.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9402085b7e39ce2d4228c84819abe5cc
+_md5_=6901c6a2b268deb04ae0b6ffb8aae315
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index 9a811e35b2c6..c18fc3670730 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Pod-Parser virtual/perl-if virtual/perl-Module-Build dev-lan
 DESCRIPTION=Convert Pod data to formatted LaTeX
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Pod-LaTeX/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=0bdcb4bdbbecb6c7d177f3a4579cfaeb
+_md5_=b05400fc2a1e28459f414f22b51ba028
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.18.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.18.0
index dce866707aec..521631304eed 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.18.0
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl XS frontend to the Xapian C++ search library
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Search-Xapian/
 IUSE=examples
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ia64 ~mips ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=~dev-libs/xapian-1.2.18 !dev-libs/xapian-bindings[perl] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.18.0.tar.gz http://oligarchy.co.uk/xapian/1.2.18/Search-Xapian-1.2.18.0.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ff4fda8813bdb139a3cdf09c59353dca
+_md5_=3c8db05dfbc522665852c5f30a07572e
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 b5e41dbda459..011626bd7cb4 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=amd64 arm ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=amd64 arm ppc ~ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 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	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	32ce14ce4574ee32c1cc1051d65b175c	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2dace41bc6aee7f3858fb8432f7efd0a
+_md5_=e53e65536fbe3a3ce4a634469a2dba27
diff --git a/metadata/md5-cache/dev-python/coverage-3.7.1 b/metadata/md5-cache/dev-python/coverage-3.7.1
index 0cd9aabcf236..bd108e0d4f4e 100644
--- a/metadata/md5-cache/dev-python/coverage-3.7.1
+++ b/metadata/md5-cache/dev-python/coverage-3.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=5
 HOMEPAGE=http://nedbatchelder.com/code/coverage/ http://pypi.python.org/pypi/coverage
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-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
+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
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-3.7.1.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=ba655def0d5d7b4154e9e6cab047ebe8
+_md5_=cd942595cb59dfe19c12ca614e195ac7
diff --git a/metadata/md5-cache/dev-python/cython-0.21 b/metadata/md5-cache/dev-python/cython-0.21
index 74783e20d3d8..a88a83a7b4d9 100644
--- a/metadata/md5-cache/dev-python/cython-0.21
+++ b/metadata/md5-cache/dev-python/cython-0.21
@@ -4,11 +4,11 @@ DESCRIPTION=A Python to C compiler
 EAPI=5
 HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
 IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://www.cython.org/release/Cython-0.21.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d500bda769bc291710858018dc3b5151
+_md5_=eff6ec489c0642135975d0217387e9c8
diff --git a/metadata/md5-cache/dev-python/docutils-0.12 b/metadata/md5-cache/dev-python/docutils-0.12
index bed12b64e4a8..9c0493ecc7d8 100644
--- a/metadata/md5-cache/dev-python/docutils-0.12
+++ b/metadata/md5-cache/dev-python/docutils-0.12
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=5
 HOMEPAGE=http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.12.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=03ddfa8c9129f24c60cb4ba7da79533b
+_md5_=a40412900711ed8a96b35f65d1dea9a0
diff --git a/metadata/md5-cache/dev-python/extras-0.0.3 b/metadata/md5-cache/dev-python/extras-0.0.3
index 5ed7105612b9..26a513fd0d03 100644
--- a/metadata/md5-cache/dev-python/extras-0.0.3
+++ b/metadata/md5-cache/dev-python/extras-0.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Useful extra bits for Python that should be in the standard library
 EAPI=5
 HOMEPAGE=https://github.com/testing-cabal/extras/ http://pypi.python.org/pypi/extras/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-0.0.3.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=69e4243eccbaf97189d3d1208da9007e
+_md5_=c073f66e266d163d867fd0e26b3dbff3
diff --git a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1 b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
index 797b9c97c34f..d8ac0afd8b42 100644
--- a/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/mimeparse-0.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basic functions for handling mime-types in python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/mimeparse https://github.com/dbtsai/python-mimeparse
 IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5009bbe7024bbac1d51ece62136d5460
+_md5_=d4d4ebaf6cfe6e8416958cf7b34b6286
diff --git a/metadata/md5-cache/dev-python/mock-1.0.1-r2 b/metadata/md5-cache/dev-python/mock-1.0.1-r2
index 172024e7bdfb..df8f9ce042b6 100644
--- a/metadata/md5-cache/dev-python/mock-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/mock-1.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A Python Mocking and Patching Library for Testing
 EAPI=5
 HOMEPAGE=http://www.voidspace.org.uk/python/mock/ http://pypi.python.org/pypi/mock
 IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-1.0.1.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=69b3d8eda31f4a9fe025e61109b76c42
+_md5_=18e978de982640b2490bcdaff8203260
diff --git a/metadata/md5-cache/dev-python/mysql-python-1.2.5 b/metadata/md5-cache/dev-python/mysql-python-1.2.5
index 6f02a85731a7..abc7dd2419b7 100644
--- a/metadata/md5-cache/dev-python/mysql-python-1.2.5
+++ b/metadata/md5-cache/dev-python/mysql-python-1.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to MySQL
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/mysql-python/ http://pypi.python.org/pypi/MySQL-python
 IUSE=doc python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=virtual/mysql python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MySQL-python/MySQL-python-1.2.5.zip
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0f88a854394c9c8768b4b58fd0c150b6
+_md5_=9514dd318fe9ae3622a2f9a8f27375bc
diff --git a/metadata/md5-cache/dev-python/nose-1.3.4 b/metadata/md5-cache/dev-python/nose-1.3.4
index 79230f1c3c48..8c34b68e7a7f 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.4
+++ b/metadata/md5-cache/dev-python/nose-1.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A unittest extension offering automatic test suite discovery and eas
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-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
+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
 LICENSE=LGPL-2.1
 RDEPEND=dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.4.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=44e3c43e03e5571384fbed4150825e91
+_md5_=ce5c3dd9db5e4fec4cd3d2e6483a8c10
diff --git a/metadata/md5-cache/dev-python/pexpect-3.3 b/metadata/md5-cache/dev-python/pexpect-3.3
index 25a16a6dbfd7..75a464011e66 100644
--- a/metadata/md5-cache/dev-python/pexpect-3.3
+++ b/metadata/md5-cache/dev-python/pexpect-3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for spawning child applications and responding to expe
 EAPI=5
 HOMEPAGE=http://pexpect.sourceforge.net/ http://pypi.python.org/pypi/pexpect/ https://github.com/pexpect/pexpect/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-3.3.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=58dc91d20c45a35f2e4bce7d031ab910
+_md5_=44748f5985b7bc19922cdf515496af93
diff --git a/metadata/md5-cache/dev-python/psycopg-2.5.3 b/metadata/md5-cache/dev-python/psycopg-2.5.3
index 130f683d8a1e..70c6c4726e5f 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.5.3
+++ b/metadata/md5-cache/dev-python/psycopg-2.5.3
@@ -4,7 +4,7 @@ DESCRIPTION=PostgreSQL database adapter for Python
 EAPI=5
 HOMEPAGE=http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2
 IUSE=debug doc examples python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=virtual/postgresql-8.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.5.3.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7cb890a1240e236f9c6141a8974e0712
+_md5_=fe1bf6b18d759fc7f685c077798fbc67
diff --git a/metadata/md5-cache/dev-python/py-1.4.25 b/metadata/md5-cache/dev-python/py-1.4.25
index 8b795e7918dc..6bffe2c124b3 100644
--- a/metadata/md5-cache/dev-python/py-1.4.25
+++ b/metadata/md5-cache/dev-python/py-1.4.25
@@ -4,11 +4,11 @@ DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilitie
 EAPI=5
 HOMEPAGE=http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py
 IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.25.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a18bdf8df46b5f4c5f43f3c7f0c19979
+_md5_=150207189356daf3f9b3d2678bbc5ffd
diff --git a/metadata/md5-cache/dev-python/pygments-1.6_p20140324-r1 b/metadata/md5-cache/dev-python/pygments-1.6_p20140324-r1
index 7bea74cbeed3..73da87731162 100644
--- a/metadata/md5-cache/dev-python/pygments-1.6_p20140324-r1
+++ b/metadata/md5-cache/dev-python/pygments-1.6_p20140324-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=5
 HOMEPAGE=http://pygments.org/ http://pypi.python.org/pypi/Pygments
 IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> pygments-1.6_p20140324.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=c360a06e0c00741e7338ed25859d2704
+_md5_=c3db347b6c252bcd2f2e6b80cb097495
diff --git a/metadata/md5-cache/dev-python/pytest-2.6.3 b/metadata/md5-cache/dev-python/pytest-2.6.3
index d5346a67ca50..99d46c321825 100644
--- a/metadata/md5-cache/dev-python/pytest-2.6.3
+++ b/metadata/md5-cache/dev-python/pytest-2.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=py.test: simple powerful testing with Python
 EAPI=5
 HOMEPAGE=http://pytest.org/ http://pypi.python.org/pypi/pytest
 IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~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=>=dev-python/py-1.4.25[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-2.6.3.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=032a225740dffff46e71ce931e2c5e59
+_md5_=456878dc3ccf7a5c6f35ec900d31c2da
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.15 b/metadata/md5-cache/dev-python/python-ldap-2.4.15
index 2db8d91fdf66..7fb97ab86f78 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.15
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.15
@@ -4,11 +4,11 @@ DESCRIPTION=Various LDAP-related Python modules
 EAPI=5
 HOMEPAGE=http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap
 IUSE=examples sasl ssl python_targets_python2_7 python_targets_pypy
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=PSF-2
 RDEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.15.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=458f27294eb69f92137ac0e06e6e5a1c
+_md5_=e815a57d31e202a26b0e2c9898f409a5
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.11 b/metadata/md5-cache/dev-python/pyyaml-3.11
index d738c290cd2e..2e856622d96c 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.11
+++ b/metadata/md5-cache/dev-python/pyyaml-3.11
@@ -4,11 +4,11 @@ DESCRIPTION=YAML parser and emitter for Python
 EAPI=5
 HOMEPAGE=http://pyyaml.org/wiki/PyYAML http://pypi.python.org/pypi/PyYAML
 IUSE=examples libyaml python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=724a1a9b2c1b657a7b793b1c00e998a9
+_md5_=e7dff4b9132b41d968db170d5b4de824
diff --git a/metadata/md5-cache/dev-python/sphinx-1.2.2 b/metadata/md5-cache/dev-python/sphinx-1.2.2
index 8344e432c403..967dcf06fc9c 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.2.2
+++ b/metadata/md5-cache/dev-python/sphinx-1.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python documentation generator
 EAPI=5
 HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
 IUSE=doc latex test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/docutils-0.7[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/jinja-2.3[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_pypy(-)?,-python_single_target_pypy(-)] >=dev-python/pygments-1.2[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.2.2.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2d2ea3ed20562c5ed8d498edbcac9a60
+_md5_=464d16cf2b240150f31f369ae5976e80
diff --git a/metadata/md5-cache/dev-python/testtools-0.9.36 b/metadata/md5-cache/dev-python/testtools-0.9.36
index a70fbdec923b..420644f126c5 100644
--- a/metadata/md5-cache/dev-python/testtools-0.9.36
+++ b/metadata/md5-cache/dev-python/testtools-0.9.36
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions to the Python unittest library
 EAPI=5
 HOMEPAGE=https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
 IUSE=doc test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/extras[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://launchpad.net/testtools/trunk/0.9.36/+download/testtools-0.9.36.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7c6f95a1f98febbc60103990783f4dd3
+_md5_=cdf14004c8242cbe1a4e9b553008f86f
diff --git a/metadata/md5-cache/dev-python/twisted-conch-14.0.1 b/metadata/md5-cache/dev-python/twisted-conch-14.0.1
new file mode 100644
index 000000000000..68002d505cb8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-conch-14.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-python/twisted-core-14.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted SSHv2 implementation
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND==dev-python/twisted-core-14.0*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Conch/14.0/TwistedConch-14.0.1.tar.bz2
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6fbe78e3d926c11a670178e58cb9e4ca
diff --git a/metadata/md5-cache/dev-python/twisted-core-14.0.1 b/metadata/md5-cache/dev-python/twisted-core-14.0.1
new file mode 100644
index 000000000000..b0d951790b73
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twisted-core-14.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=test? ( >=net-zope/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=An asynchronous networking framework written in Python
+EAPI=5
+HOMEPAGE=http://www.twistedmatrix.com/
+IUSE=crypt gtk serial test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=net-zope/zope-interface-3.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] crypt? ( >=dev-python/pyopenssl-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/service_identity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) serial? ( dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://twistedmatrix.com/Releases/Core/14.0/TwistedCore-14.0.1.tar.bz2
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	twisted-r1	8e3123a6498c5da6dd9d8135b3655efd	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2a38ef89d1d22556e5996830dd2be091
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
index e35d4efa9a11..231fa204966d 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=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] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Library which enable you to define abstract method in Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/abstract-1.0.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3610e6daed979b8a7c013b1a2b2f513f
+_md5_=8b731ae0f6f7646b40812ee0087583e3
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index 7a3df8c6a4ea..236620051b48 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( 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=Library which enable you to define abstract method in Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/abstract-1.0.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=25109874d91ccd9c6efa185bf57ec848
+_md5_=bb0af574ef94e16478cc2037bf7f1000
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.5.0 b/metadata/md5-cache/dev-ruby/acts_as_list-0.5.0
new file mode 100644
index 000000000000..5dfbc8ac79eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/activerecord:3.2[ruby_targets_ruby19,sqlite3] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/activerecord:3.2[ruby_targets_ruby20,sqlite3] ) ) 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=Capabilities for sorting and reordering a number of objects in a list
+EAPI=5
+HOMEPAGE=https://github.com/swanandp/acts_as_list
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
+KEYWORDS=~amd64 ~x86 ~x86-macos
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activerecord-3[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/acts_as_list-0.5.0.gem
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e54a86cab8044176f10cd7007b012584
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
index 3ee838f10157..2f8b194abb6c 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=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] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A modern, pretty RDoc template
 EAPI=5
 HOMEPAGE=http://fauna.github.com/fauna/allison/files/README.html
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris
 LICENSE=AFL-3.0
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/allison-2.0.3.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6259cc497c79e07d7c575874aa73781e
+_md5_=e54369b0eda42514096a1c1a518816ba
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index cb66fea1e823..05c0509f0e01 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( 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 modern, pretty RDoc template
 EAPI=5
 HOMEPAGE=http://fauna.github.com/fauna/allison/files/README.html
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-solaris
 LICENSE=AFL-3.0
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/allison-2.0.3.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8953d25f016430507547488af6cb75e2
+_md5_=a25dd86ecd272250422e110f74739de4
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2 b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
index 37d75af6e17e..121e81fdc8d3 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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 AMQP 0.9.1 serialization library for Ruby
 EAPI=5
 HOMEPAGE=http://github.com/ruby-amqp/amq-protocol
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+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-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/amq-protocol-1.9.2.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8421f409924eff09307ef7aa2a6af829
+_md5_=8f5c7e44d19dddac6baf31310694f5b3
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 0bdaa5fa2248..6d421a1e3e1e 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby/builder[ruby_targets_ruby19] dev-ruby/mime-types[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/xml-simple[ruby_targets_jruby] dev-ruby/builder[ruby_targets_jruby] dev-ruby/mime-types[ruby_targets_jruby] virtual/ruby-ssl[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/flexmock[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/flexmock[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby/builder[ruby_targets_ruby19] dev-ruby/mime-types[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/flexmock[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Client library for Amazon's Simple Storage Service's REST API
 EAPI=4
 HOMEPAGE=http://amazon.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby/builder[ruby_targets_ruby19] dev-ruby/mime-types[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/xml-simple[ruby_targets_jruby] dev-ruby/builder[ruby_targets_jruby] dev-ruby/mime-types[ruby_targets_jruby] virtual/ruby-ssl[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby/builder[ruby_targets_ruby19] dev-ruby/mime-types[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/aws-s3-0.6.3.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c7633e7217a4394a4e9d1a428106c3c4
+_md5_=146a446083099753e6fe9aa150e53e15
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1 b/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
index 3edabb7fed22..70c1a6e2efd0 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit: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/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=Extends mocha to allow detailed tracking and querying of stub and mock invocations
 EAPI=5
 HOMEPAGE=http://github.com/thoughtbot/bourne
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+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/mocha-0.13.2:0.13[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mocha-0.13.2:0.13[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=0
 SRC_URI=mirror://rubygems/bourne-1.5.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=09d7b7371fea87580a95568f10712732
+_md5_=60a1ba9926f5039ac42c0b509307e4e6
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.1.3
index 085f4128a19d..9036ee123c25 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.10[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=4
 HOMEPAGE=https://github.com/halostatue/diff-lcs
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 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 Ruby GPL-2 )
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.1.3.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=23b7f1cf572b57965cc73f5c797f4de8
+_md5_=1b137b1828d633fd5f7d76fe49493bfd
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
index a9e0c5249137..b51db58f0e25 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=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/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+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
 LICENSE=|| ( MIT Ruby GPL-2 )
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/diff-lcs-1.2.5.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a72d9bdd94d91d6b0341182bf9500703
+_md5_=bea810605068223ee7a20423609983a1
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index 8276f99d2578..29112fa49056 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 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 Ruby GPL-2 )
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/diff-lcs-1.2.5.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3235b1be112291057a65b2dde13b5fda
+_md5_=0df8c9ec762fea69f322e56457152292
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.13 b/metadata/md5-cache/dev-ruby/domain_name-0.5.13
index 19ae23cdf633..e755e3e66369 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.13
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] dev-ruby/shoulda[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.13.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5cf04c097cf6b77ee615e280ef2d8fd4
+_md5_=7ea5dd1c324cab2c4c394040a76dcb0e
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.19 b/metadata/md5-cache/dev-ruby/domain_name-0.5.19
index 65ef3098f909..3bece7d9e9b7 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.19
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.19
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] dev-ruby/shoulda[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[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] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[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=0
 SRC_URI=mirror://rubygems/domain_name-0.5.19.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=55d9ca99fca41737de693fee89a76288
+_md5_=f946320019cfbd54fee995bd6160301c
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20
index 9862bfce1ede..85b8e9e978e3 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] dev-ruby/shoulda[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby20] dev-ruby/shoulda[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby21] dev-ruby/shoulda[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] ) )
 DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/unf-0.0.5-r1:0[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=0
 SRC_URI=mirror://rubygems/domain_name-0.5.20.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b043241fc7c70577d5ffc48e48c71157
+_md5_=51b8f61a02e09eb150406342704bdc3e
diff --git a/metadata/md5-cache/dev-ruby/facter-1.7.1-r1 b/metadata/md5-cache/dev-ruby/facter-1.7.1-r1
index 6a2c8428807c..99adbf784ba0 100644
--- a/metadata/md5-cache/dev-ruby/facter-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/facter-1.7.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=+dmi +pciutils elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=amd64 hppa ppc ~ppc64 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-1.7.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bfd680b1e21caf7a49b545336ba69190
+_md5_=dd168975de6d8a2db40fabe5872dfcce
diff --git a/metadata/md5-cache/dev-ruby/facter-1.7.6 b/metadata/md5-cache/dev-ruby/facter-1.7.6
index e35a744eaf18..bcef22b7a64b 100644
--- a/metadata/md5-cache/dev-ruby/facter-1.7.6
+++ b/metadata/md5-cache/dev-ruby/facter-1.7.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=+dmi +pciutils elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=amd64 hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-1.7.6.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d4be521375359f42fe3871950b7b66b6
+_md5_=1dc4eafb150e8cf3f22e3dbd3844ac05
diff --git a/metadata/md5-cache/dev-ruby/facter-2.0.2 b/metadata/md5-cache/dev-ruby/facter-2.0.2
index 4da9d714f5c7..b3fc1367b589 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.0.2
+++ b/metadata/md5-cache/dev-ruby/facter-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.0.2.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3c231017c71d2126acf1998b30739a55
+_md5_=f8b04561cccfed680c653218b52435fa
diff --git a/metadata/md5-cache/dev-ruby/facter-2.1.0 b/metadata/md5-cache/dev-ruby/facter-2.1.0
index 32a07c01d45f..91faf0abaefa 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.1.0
+++ b/metadata/md5-cache/dev-ruby/facter-2.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.1.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8b1b6ca44eb33995d2ddf4e242b66707
+_md5_=c3dab3e73e5ab1e3b9b785cefdec0780
diff --git a/metadata/md5-cache/dev-ruby/facter-2.2.0 b/metadata/md5-cache/dev-ruby/facter-2.2.0
index 9a91fc6a8e6b..07b689651b64 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.2.0
+++ b/metadata/md5-cache/dev-ruby/facter-2.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/mocha-0.10.5:0.10[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=A cross-platform Ruby library for retrieving facts from operating systems
 EAPI=5
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
-IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=+dmi +pciutils +virt elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( sys-apps/dmidecode ) pciutils? ( sys-apps/pciutils ) 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/facter-2.2.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6f786a7b83562b30e2a8b014db454852
+_md5_=75dcc95896acc6a45bff60e206189dd0
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.2.1 b/metadata/md5-cache/dev-ruby/hiera-1.2.1
index 91c3c5687482..9f9f6ea55d93 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.2.1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/json[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=5
 HOMEPAGE=http://projects.puppetlabs.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=amd64 hppa ppc sparc x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/json[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.2.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e91fd6a649b2f173d9afe23d0c8bc771
+_md5_=26c3f57e70e791253c12549147a07e49
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3 b/metadata/md5-cache/dev-ruby/hike-1.2.3
index 3774a1bc9893..a8b8369b1f90 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) 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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=661fd3ead9f428f39b7a4bb35370264f
+_md5_=19d43842be00e267bbbb99b696ee5edd
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
index 91c2bf05700e..4525ad0e0ae5 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( 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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=https://github.com/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a1a968533f0d0e6d15dd778b127ff786
+_md5_=5f65a9f6d8257c6c8c1fd5c16819f0a6
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index 17b0a6bbb81a..ed5fe1534bf3 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest[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/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=Hike is a Ruby library for finding files in a set of paths
 EAPI=5
 HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=2
 SRC_URI=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e7f23a99c24f816d5b0e9a66d9efb146
+_md5_=944054692fe726c4a62a89f2bb64ffff
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3 b/metadata/md5-cache/dev-ruby/listen-0.7.3
index 668510af2548..3dd9690ec8c1 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=629e69a0f9133075ee78d232fd9dd007
+_md5_=a57906546ebd9966468cf8e0b1a3e4c6
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
index 4be9d2d5aeb3..e21d1084ca38 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[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=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=53e20bd8256311d8ca922c3bdfbf4059
+_md5_=f5a29b831bab39bc122d543eb5ac0cfd
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
index add621c57883..d5b12dc9eac4 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[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:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[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=0
 SRC_URI=https://github.com/guard/listen/archive/v0.7.3.tar.gz -> listen-0.7.3-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f825c28b375d623f39d73f34a0bdced8
+_md5_=dd3690ce5c75fffc867b232948084df7
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
index f6d64d59532a..e7fdb85b8b4a 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[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:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Listens to file modifications and notifies you about the changes
 EAPI=5
 HOMEPAGE=https://github.com/guard/listen
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rb-inotify-0.9.0[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=1
 SRC_URI=https://github.com/guard/listen/archive/v1.3.1.tar.gz -> listen-1.3.1-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dc6bdd2a24416b87d04fe2205e452021
+_md5_=a34846c56ffd3854524e1d29f0a9dbfa
diff --git a/metadata/md5-cache/dev-ruby/logging-1.8.2 b/metadata/md5-cache/dev-ruby/logging-1.8.2
index 9703471c819f..4c95ce1a7daf 100644
--- a/metadata/md5-cache/dev-ruby/logging-1.8.2
+++ b/metadata/md5-cache/dev-ruby/logging-1.8.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby19] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby20] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_jruby] >=dev-ruby/multi_json-1.3.6[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-ruby/bones[ruby_targets_ruby19] test? ( dev-ruby/flexmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/bones[ruby_targets_ruby20] test? ( dev-ruby/flexmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/bones[ruby_targets_ruby21] test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( dev-ruby/bones[ruby_targets_jruby] test? ( dev-ruby/flexmock[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby19] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby20] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-ruby/bones[ruby_targets_ruby19] test? ( dev-ruby/flexmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/bones[ruby_targets_ruby20] test? ( dev-ruby/flexmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/bones[ruby_targets_ruby21] test? ( dev-ruby/flexmock[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=Flexible logging library for use in Ruby programs based on the design of Java's log4j library
 EAPI=5
 HOMEPAGE=http://rubygems.org/gems/logging
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby19] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby20] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_jruby] >=dev-ruby/multi_json-1.3.6[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby19] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby20] >=dev-ruby/multi_json-1.3.6[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby21] >=dev-ruby/multi_json-1.3.6[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=0
 SRC_URI=mirror://rubygems/logging-1.8.2.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=86d7097cec4d3c76d14c4e78f4d9766f
+_md5_=8c7e45ec77182421d62b3979de830af0
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-1.2.0 b/metadata/md5-cache/dev-ruby/multipart-post-1.2.0
index 6f75223f8602..a3ad532ecc7c 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-1.2.0
+++ b/metadata/md5-cache/dev-ruby/multipart-post-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Adds a streamy multipart form post capability to Net::HTTP
 EAPI=5
 HOMEPAGE=http://github.com/nicksieger/multipart-post
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/multipart-post-1.2.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4918d091164c4d600b9db39d49f58c0d
+_md5_=6c909eb61b1120c3bdd1673e7820918e
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0 b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
index bb9f499b0f8c..e715ec969179 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( 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=Adds a streamy multipart form post capability to Net::HTTP
 EAPI=5
 HOMEPAGE=http://github.com/nicksieger/multipart-post
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/multipart-post-2.0.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b17d8f4b39d71e47c616df5fe6bf96bb
+_md5_=b81f7d775370ccc7c4476a57b3884589
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r1 b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r1
index 530a1d80fe04..92af14f08260 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r1
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/mocha:0.12[ruby_targets_jruby] dev-ruby/webmock[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A RubyGem for implementing both OAuth clients and servers
 EAPI=5
 HOMEPAGE=http://oauth.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth-0.4.7.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c05a3ad85b13f8f9279589f4e6784aa2
+_md5_=cf3bd167a7c913d9d4dfbce5e1f94d9e
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2 b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
index b0e480fd99b5..36f26043217c 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/mocha:0.12[ruby_targets_ruby20] dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/mocha:0.12[ruby_targets_jruby] dev-ruby/webmock[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha:0.12[ruby_targets_ruby19] dev-ruby/webmock[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] dev-ruby/mocha:0.12[ruby_targets_ruby20] dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) 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=A RubyGem for implementing both OAuth clients and servers
 EAPI=5
 HOMEPAGE=http://oauth.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/oauth-0.4.7.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=19e45a40c941394b6332c6be25c92689
+_md5_=d87793803ab2bdf9de6e7d789cf7c3bf
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4
index bd19fe250722..e0d71541f17d 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=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=Extends ruby's String class with colored text on ANSI terminals
 EAPI=5
 HOMEPAGE=http://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=amd64 hppa ppc sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f9651ff711d955d1d7f72d561c235ae3
+_md5_=467c61c95df46bb511a1603c62c4f816
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
index 5b3aa5f898d4..b240dad62ca0 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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/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=Extends ruby's String class with colored text on ANSI terminals
 EAPI=5
 HOMEPAGE=http://github.com/sickill/rainbow
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=26404752899150400dc2bb7185fa905e
+_md5_=7e9a306c5c2b7fbeb41d0937c71b13e5
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r1 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r1
index 0b832ff9c3b2..19ef9ccab22b 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/hashie-2.0.0[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0[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/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Rash is an extension to Hashie
 EAPI=5
 HOMEPAGE=https://github.com/tcocca/rash
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby21] ) ruby_targets_jruby? ( >=dev-ruby/hashie-2.0.0[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/hashie-2.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/hashie-2.0.0[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=0
 SRC_URI=mirror://rubygems/rash-0.4.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=be75bcccefdc2b1a72e4dc9fffc050be
+_md5_=b89cca035c4406ba58f72616a6814372
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38
index 693e4a89ec2e..dbfaec5a69a2 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A multipurpose documentation format for Ruby
 EAPI=4
 HOMEPAGE=https://github.com/uwabami/rdtool
-IUSE=emacs elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=emacs elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=Ruby GPL-2
-RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aafd7eef2544e35c659312c69e0d8d83
+_md5_=4785405192edf69d1df4f01e5c46eb70
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
index 9e54faddbda2..289cbc69affe 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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/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=A multipurpose documentation format for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/uwabami/rdtool
-IUSE=emacs elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=emacs elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=Ruby GPL-2
-RDEPEND=emacs? ( virtual/emacs ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+RDEPEND=emacs? ( virtual/emacs ) 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/rdtool-0.6.38.gem
 _eclasses_=elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e0edc440ef77112a2f09abf7afc06b31
+_md5_=007de3b58a9ee843baeb4f25dd14a85e
diff --git a/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1 b/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1
index ab4ca8099161..9e250b428088 100644
--- a/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/require_relative-1.0.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( virtual/ruby-minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( virtual/ruby-minitest[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( virtual/ruby-minitest[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( virtual/ruby-minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( virtual/ruby-minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( virtual/ruby-minitest[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/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=Backport require_relative from ruby 1.9.2
 EAPI=5
 HOMEPAGE=http://steveklabnik.github.com/require_relative
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Ruby BSD WTFPL-2 )
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/require_relative-1.0.3.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c1d1d4e43f47eb1ca3830baba3c2fa0b
+_md5_=ace27418410715964f25a7f145a30213
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r1 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r1
deleted file mode 100644
index f6069f405c7d..000000000000
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.6.2[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.6.2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=Rexical is a lexical scanner generator
-EAPI=2
-HOMEPAGE=http://github.com/tenderlove/rexical/tree/master
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby 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=LGPL-2
-RDEPEND=!!app-admin/rex ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-SLOT=0
-SRC_URI=mirror://rubygems/rexical-1.0.5.gem
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9951e59eb1e7e057c12f39adc37e007c
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
index 3a3ce2f8a7ab..5a9caacadd96 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=5
 HOMEPAGE=http://github.com/tenderlove/rexical/tree/master
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby 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=LGPL-2
 RDEPEND=!!app-admin/rex ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.5.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=710c6606abe22907aaca5185b1288b40
+_md5_=27f86b76cbb7b421776064279fe0a42e
diff --git a/metadata/md5-cache/dev-ruby/right_aws-1.10.0 b/metadata/md5-cache/dev-ruby/right_aws-1.10.0
index 73b2de19dc1c..bf46d6205d8a 100644
--- a/metadata/md5-cache/dev-ruby/right_aws-1.10.0
+++ b/metadata/md5-cache/dev-ruby/right_aws-1.10.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.4[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/right_http_connection-1.2.4[ruby_targets_jruby] dev-ruby/uuidtools[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.4[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront
 EAPI=5
 HOMEPAGE=http://www.rightscale.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.4[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/right_http_connection-1.2.4[ruby_targets_jruby] dev-ruby/uuidtools[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.4[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/right_aws-1.10.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=78f587c50789b80e50e9eb3e8ec2ad36
+_md5_=57a295b39831a77d352deb440c92cf56
diff --git a/metadata/md5-cache/dev-ruby/right_aws-3.0.4 b/metadata/md5-cache/dev-ruby/right_aws-3.0.4
index 7c539312bca6..27022ff5e1ff 100644
--- a/metadata/md5-cache/dev-ruby/right_aws-3.0.4
+++ b/metadata/md5-cache/dev-ruby/right_aws-3.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.5[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/right_http_connection-1.2.5[ruby_targets_jruby] dev-ruby/uuidtools[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.5[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront
 EAPI=5
 HOMEPAGE=http://www.rightscale.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.5[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/right_http_connection-1.2.5[ruby_targets_jruby] dev-ruby/uuidtools[ruby_targets_jruby] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/right_http_connection-1.2.5[ruby_targets_ruby19] dev-ruby/uuidtools[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/right_aws-3.0.4.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c2f0640e19c079b2cfc493504e671d00
+_md5_=ba138451a928e928f015c56b6b73fcb6
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index 82d892fc5a75..93096e8eb185 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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/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=A simple Ruby library to parse robots.txt
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/robots
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~arm ~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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/robots-0.10.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1536870a99df359c62c72bcfcb92c312
+_md5_=fd57a31c03444c48b7f04d8af0d093a1
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.12.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.12.1
index 3b37d1f87db0..485e0c0c5804 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.12.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=4
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/tarball/v2.12.1 -> rspec-mocks-2.12.1-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ab71a6b21ab7342437d57896e9605129
+_md5_=7002e04b965927db84edfb8b6d9bfbb0
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
index 84e12e9c1597..8e992083ff85 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby20] dev-ruby/rspec-expectations:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby20] dev-ruby/rspec-expectations:2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6bb15f8c53fe112aeebc53ce5ffd37e1
+_md5_=00af7ba7ea2b429ea55af50337a2d54d
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index 91ba6c7caa34..29b3baf428db 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby20] dev-ruby/rspec-expectations:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby21] dev-ruby/rspec-expectations:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_jruby] dev-ruby/rspec-expectations:2[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] dev-ruby/rspec-expectations:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby20] dev-ruby/rspec-expectations:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby21] dev-ruby/rspec-expectations: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:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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 Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=81246b153f67c79dfefeff02796d4569
+_md5_=cdeed00cdb29d03e4f908370e3c7f20c
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 825eb4bf5986..c1749218d563 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_jruby] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.99.0:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-2.10.0:2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0: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:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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 Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ac2af4a9a33a484e63591f5258d2ae8d
+_md5_=c9aa8e4762c5a8f9f3ccb6a888dd6d90
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
index 10344a8f5dd6..28163cae220e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-2.3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( ~dev-ruby/locale-2.0.5[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) dev-ruby/racc[ruby_targets_ruby19] ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) dev-ruby/racc[ruby_targets_jruby] ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit-rr[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit-rr[ruby_targets_jruby] ) ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( ~dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) dev-ruby/racc[ruby_targets_ruby19] ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit-rr[ruby_targets_ruby19] ) ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package
 EAPI=4
 HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 ppc ppc64 sparc x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( ~dev-ruby/locale-2.0.5[ruby_targets_jruby] ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) sys-devel/gettext ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-2.3.3.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=95314f817d3c9f224cc45523c2992d3e
+_md5_=b8b04fe8ae311889e4fdea263534c228
diff --git a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2 b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
index 258b77d96e4f..52f0a845d3cf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
@@ -1,14 +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_jruby? ( dev-java/jruby )
+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 )
 DESCRIPTION=Small library to parse INI-files in Ruby
 EAPI=5
 HOMEPAGE=http://raa.ruby-lang.org/project/ruby-inifile/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-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_jruby? ( dev-java/jruby )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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://gregoire.lejeune.free.fr/ruby-inifile_2.0.0.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=230c626d99c63946c868ce89612fab69
+_md5_=d445f68004656cc2299e5b3e6f430d19
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2 b/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
index 43c2a5b1d4f3..a0f9e1ed40d4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.2.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/test-unit:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A robust library for verifying and serving OpenID identities
 EAPI=4
 HOMEPAGE=http://ruby-openid.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test
 KEYWORDS=amd64 ~ppc x86 ~x86-macos
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-openid-2.2.2.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=630ebf1a44364e440d75498438cdf488
+_md5_=d82e292aaf09842733395c9981a83b27
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1
index 15379403578f..5eef12732f7c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/timecop[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/timecop[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/timecop[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A Text Progress Bar Library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
 KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4875c4bb1368f18f861afa70e29195b
+_md5_=89e5a17f8bd107393c9886a0bd4b1255
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
index d460f9397c52..b14b5a8a7e96 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=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] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=A Ruby port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test
 KEYWORDS=amd64 x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/rubypants-0.2.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=889f055842a223db6228791cb0c5d540
+_md5_=a94160af37a03b6d78cb1bb5c3857848
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
index 21027eb4e2f7..1c1b53316dae 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( 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 Ruby port of the SmartyPants PHP library
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/rubypants/README
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
 KEYWORDS=~amd64 ~x86
 LICENSE=Ruby
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/rubypants-0.2.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=70b8fe3bf3420aad6a8496c6dd33b838
+_md5_=131eabd6fd58678585d15fdfdd35936b
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.2.16 b/metadata/md5-cache/dev-ruby/stomp-1.2.16
index d424fc7b5949..59a0685f007e 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.2.16
+++ b/metadata/md5-cache/dev-ruby/stomp-1.2.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Ruby bindings for the stomp messaging protocol
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/stomp/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.2.16.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b53ba720f42a5833e4b45eaa259cd5e6
+_md5_=84fba30f2914516e3cfa26ef335f4b69
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.2 b/metadata/md5-cache/dev-ruby/stomp-1.3.2
index ff8a5ed824bf..f6a0ee299471 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.2
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.2
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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/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/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Ruby bindings for the stomp messaging protocol
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/stomp/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/stomp-1.3.2.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3c8f1a78a388b9fd466ba91135e5ebef
+_md5_=8218112d2a4d6224b0064ba0eb500cba
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
index fbec60e44e06..e23ce2fa1919 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.2.2-r1
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=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=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=http://term-ansicolor.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc 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=GPL-2
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/term-ansicolor-1.2.2.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8a61d45cc280877759b1ab0febbe8877
+_md5_=e2bd4e3f6c1e06f55d6449041bf389cf
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
index acbe78b84172..a1ba4858ccfe 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
@@ -1,14 +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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( 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=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=5
 HOMEPAGE=http://term-ansicolor.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc 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=GPL-2
-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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/term-ansicolor-1.3.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=58ce7b320d7860f449c8a927bf1780c6
+_md5_=ea6a548de91e52a5a789612b7570c887
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
index afe9bdd05df5..4c7fc09ac293 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Hyphenates various words according to the rules of the language the word is written in
 EAPI=4
 HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9fc8e47d0f37b73008a672382ae06e3a
+_md5_=95893d3d1932dc770690e034dc0c269a
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
index 06db44452567..cbd94a82ebc2 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) test? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( >=dev-ruby/hoe-2.8.0[ruby_targets_ruby20] ) test? ( >=dev-ruby/hoe-2.8.0[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/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[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=Hyphenates various words according to the rules of the language the word is written in
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/text-format
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/text-hyphen-1.4.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c4002386abb3a9fd44c8e56aaf801ffb
+_md5_=6dc37ec645f0b78a5b8f470ab726d0f8
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.6.0 b/metadata/md5-cache/dev-ruby/timecop-0.6.0
index 50b922ad085c..d0f18b004f82 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.6.0
+++ b/metadata/md5-cache/dev-ruby/timecop-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=5
 HOMEPAGE=http://github.com/jtrupiano/timecop
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_jruby )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.6.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ccfce561acf1704123dae3ac6d4dd84c
+_md5_=2bfac553618fbcfd98dfa85128f5789f
diff --git a/metadata/md5-cache/dev-ruby/timers-1.1.0-r1 b/metadata/md5-cache/dev-ruby/timers-1.1.0-r1
index 8506f45a6635..d37ddddd51d8 100644
--- a/metadata/md5-cache/dev-ruby/timers-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/timers-1.1.0-r1
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Pure Ruby one-shot and periodic timers
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/timers
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~ppc ~ppc64
 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/timers-1.1.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a6e8dacdfbc4207d6b33facf4399a48e
+_md5_=c09793e59131e06c416531f7363fbb83
diff --git a/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3 b/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3
index 52ad458c86ec..1079b4358ab4 100644
--- a/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3
+++ b/metadata/md5-cache/dev-ruby/tmail-1.2.7.1-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-ruby/racc[ruby_targets_ruby19] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( dev-ruby/racc[ruby_targets_jruby] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( dev-ruby/racc[ruby_targets_ruby19] test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=An email handling library
 EAPI=2
 HOMEPAGE=http://rubyforge.org/projects/tmail/
-IUSE=debug elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=debug elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/tmail-1.2.7.1.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6e494d9f21b6773a08794552138638e9
+_md5_=f80ac34ee23464219f8bdba2ce66799d
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.3 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.3
index adcb587ff1cc..eaaf8f6f6d69 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.3
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
 DESCRIPTION=Simple library to generate UUIDs
 EAPI=2
 HOMEPAGE=http://uuidtools.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 doc test test
 KEYWORDS=amd64 x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubyforge/uuidtools/uuidtools-2.1.3.tgz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8b10c974f5ee2901ec7aa8ea20a07e0e
+_md5_=1e8eb9a8e291f0bf19ace7b1d9e55f29
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
index 55f17ec2194b..7e4c2e6d0d84 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
@@ -1,14 +1,14 @@
 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_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[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/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[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=Simple library to generate UUIDs
 EAPI=5
 HOMEPAGE=http://uuidtools.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
 KEYWORDS=amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+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/uuidtools-2.1.4.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=98fbeeb10a6d4bc092cc80e7e1fb1fec
+_md5_=7697765fae4a5d64c2f37db8156f7475
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3
index 5906e6aa9bfa..05f74e749635 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r3
@@ -1,14 +1,14 @@
 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] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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] ) ) 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/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Simple library to generate UUIDs
 EAPI=5
 HOMEPAGE=http://uuidtools.rubyforge.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/uuidtools-2.1.4.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=68d997447e929113a0947b96821f2b0b
+_md5_=72d95786b19b874efe48cf1532963362
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
index 97b514e4cb87..71a6addccb79 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
@@ -1,14 +1,14 @@
 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] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) 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_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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] ) ) 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/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=Simple library to generate UUIDs
 EAPI=5
 HOMEPAGE=https://github.com/sporkmonger/uuidtools
-IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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/uuidtools-2.1.5.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b34ec308fb991de061f4e488eda5f7d7
+_md5_=d2093ab2506fcc643e6ae696154cb2e7
diff --git a/metadata/md5-cache/dev-ruby/xpath-1.0.0-r1 b/metadata/md5-cache/dev-ruby/xpath-1.0.0-r1
index da59600b186a..c06a545accb8 100644
--- a/metadata/md5-cache/dev-ruby/xpath-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-1.0.0-r1
@@ -1,14 +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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+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? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=1
 SRC_URI=mirror://rubygems/xpath-1.0.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6bfdde12a48664cd5586ddc3513c0f39
+_md5_=6405f1de7fd44fff5b524280aff754b4
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1 b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
index 3f24c24a2cb9..369050550325 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/nokogiri[ruby_targets_jruby] ) ) 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_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/nokogiri[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:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[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=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+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=2
 SRC_URI=mirror://rubygems/xpath-2.0.0.gem
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f1be80e5c6fa2b38658ba2362977c54
+_md5_=fadd7d1eb4e98b163ecd364860f13d9a
diff --git a/metadata/md5-cache/dev-util/anjuta-3.12.0 b/metadata/md5-cache/dev-util/anjuta-3.12.0
index 752c06c307eb..6ed0108ab885 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.12.0
+++ b/metadata/md5-cache/dev-util/anjuta-3.12.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.6:3 >=dev
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.12/anjuta-3.12.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a4663bcda16a3124a69d59a9c2b546e5
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.23 b/metadata/md5-cache/dev-util/geany-plugins-1.23
index 6ce55c5a3664..e2cef6c4439c 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.23
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.23
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+commander debugger devhelp enchant gpg gtkspell lua markdown multiterm nls scope soup webkit
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
+RDEPEND=>=dev-util/geany-1.23 commander? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.23.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3bf309d79ae51699069188d2ea2d0b48
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.24-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.24-r1
index 4679e763a939..b454a11cf562 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.24-r1
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.24-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[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_2(-),-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:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[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_2(-),-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:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=5
 HOMEPAGE=http://plugins.geany.org/geany-plugins
 IUSE=+autoclose +commander debugger +defineformat devhelp enchant gpg gtkspell lua markdown multiterm nls python scope soup webkit python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[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_2(-),-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:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
+RDEPEND=>=dev-util/geany-1.24 autoclose? ( x11-libs/gtk+:2 ) commander? ( x11-libs/gtk+:2 ) defineformat? ( x11-libs/gtk+:2 ) dev-libs/libxml2:2 dev-libs/glib:2 debugger? ( x11-libs/vte:0 ) devhelp? ( dev-util/devhelp gnome-base/gconf:2 net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/libwnck:1 ) enchant? ( app-text/enchant ) gpg? ( app-crypt/gpgme ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) markdown? ( app-text/discount net-libs/webkit-gtk:2 x11-libs/gtk+:2 ) multiterm? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[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_2(-),-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:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) scope? ( sys-devel/gdb )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://plugins.geany.org/geany-plugins/geany-plugins-1.24.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03f98f7e6e0a0ecccf7abc095d8b6cd6
diff --git a/metadata/md5-cache/dev-vcs/gitg-0.3.2 b/metadata/md5-cache/dev-vcs/gitg-0.3.2
index 77c7fa9fc69e..ad5c7f24d5a0 100644
--- a/metadata/md5-cache/dev-vcs/gitg-0.3.2
+++ b/metadata/md5-cache/dev-vcs/gitg-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/
 REQUIRED_USE=python? ( || ( python_targets_python3_2 python_targets_python3_3 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/0.3/gitg-0.3.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82fd2baeaa078310d5b90e1fabe65044
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.12.3 b/metadata/md5-cache/games-board/gnome-chess-3.12.3
index 6e44dc043d71..d70821566616 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.12.3
+++ b/metadata/md5-cache/games-board/gnome-chess-3.12.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 virtual/glu virtual/opengl >=x11-libs/gtk+-3.10:3 x11-libs/libX11 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.12/gnome-chess-3.12.3.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a7bdd715c89f883ccedfffe1d1fe373
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.12.2 b/metadata/md5-cache/games-board/gnome-mahjongg-3.12.2
index 996a56e2b535..f9648c945d37 100644
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.12.2
+++ b/metadata/md5-cache/games-board/gnome-mahjongg-3.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.50 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.50 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Mahjongg
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.12/gnome-mahjongg-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62e562d2bf83f406ac6216a671c9fab1
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.12.2 b/metadata/md5-cache/games-board/gnome-mines-3.12.2
index 018ae360c5d4..41846234c7dd 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.12.2
+++ b/metadata/md5-cache/games-board/gnome-mines-3.12.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.12/gnome-mines-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b487e0761c8d6c14117b3d5789ec0b05
diff --git a/metadata/md5-cache/games-board/iagno-3.12.2 b/metadata/md5-cache/games-board/iagno-3.12.2
index ca472fa371ee..273bf1af41af 100644
--- a/metadata/md5-cache/games-board/iagno-3.12.2
+++ b/metadata/md5-cache/games-board/iagno-3.12.2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.12/iagno-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=705beccfd1a32dabb504bfa175b41079
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0
index ca3b19119d47..47267b0322b0 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Klotski
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.10/gnome-klotski-3.10.0.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=10964e18c2577f62ee10a58797ae1605
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1
index 414a8a22443b..5db8b39ec805 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Klotski
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.12/gnome-klotski-3.12.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8ae45218ffa7a01e246b14b56a7fb49
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.2 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.2
index 97015126a672..600b6afba56b 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.2
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Klotski
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.12/gnome-klotski-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=12694118085b6a2d0b10a3196c42a80e
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1
index f9dca3d5f2d3..a526f24c2643 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Complete the puzzle by matching numbered tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Tetravex
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.10/gnome-tetravex-3.10.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e04ea1dcf6b3fb6d936791dbc9d6178
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1
index 65b2c30195d9..ccdfe9302139 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.12/gnome-tetravex-3.12.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3661f7423f4c64a065dfe9b101ccc45d
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.3 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.3
index a7618f3eeaa9..c3b4514444b4 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.3
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.12.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.12/gnome-tetravex-3.12.3.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf6f074b52ecbd4b429698ad0e447002
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.10.1 b/metadata/md5-cache/games-puzzle/lightsoff-3.10.1
index 519e35eceb86..85e0af54584a 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.10.1
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Turn off all the lights
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Lightsoff
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.10/lightsoff-3.10.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8ca178c8342d67697c519321259ec649
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.12.1 b/metadata/md5-cache/games-puzzle/lightsoff-3.12.1
index e3fe61789063..f04b6cdf0cb2 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.12.1
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.12/lightsoff-3.12.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c97c10de3c04ee0e0507ef9e90542899
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.12.2 b/metadata/md5-cache/games-puzzle/lightsoff-3.12.2
index c809128c63d5..7223db3e245d 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.12.2
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.12.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.12/lightsoff-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=528aa25620c570362acc2ec8f02859dc
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2 b/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2
index a132b5b296e7..fcf5ad010565 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Quadrapassel
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.10/quadrapassel-3.10.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1827e64325fbdb78a01b3998375a5a01
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1 b/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1
index 0953ec178749..3dfd6ecd2ec5 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Quadrapassel
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.12/quadrapassel-3.12.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a76965fe6c4b283d280c6cff294b9f3b
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.12.2 b/metadata/md5-cache/games-puzzle/quadrapassel-3.12.2
index 3c24fb6afdb4..ccf88d9561fb 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.12.2
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Quadrapassel
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.12/quadrapassel-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bcbc736e5e27fa5fd631f9cad4d505d3
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.10.1 b/metadata/md5-cache/games-puzzle/swell-foop-3.10.1
index d83fe5f9ae7b..c665b63bd7cb 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.10.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
+DEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/yelp-tools >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=dev-util/intltool-0.50.2-r1
 DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Swell%20Foop
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=x11-libs/gtk+-3.4.0:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.10/swell-foop-3.10.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d3dd9e14012a86ca086d95443a0fc0a
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.12.1 b/metadata/md5-cache/games-puzzle/swell-foop-3.12.1
index 24b61d29db2f..2291600843f8 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.12.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.12/swell-foop-3.12.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=633ee9ed2262d8847c5f3a15d7e140f3
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.12.2 b/metadata/md5-cache/games-puzzle/swell-foop-3.12.2
index c5728ea67cb8..58529dd43c11 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.12.2
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.12.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.4:1.0 >=x11-libs/gtk+-3.10:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.12/swell-foop-3.12.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	games	e221fed675714bd5545b7488aed9f822	gnome-games	7f53729f215f511269a6397612dd96da	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=babdb5828f6b4216e1093571d87babaf
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
index 3e871294a2ef..646da0a2d6ea 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.16.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1 >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) vala? ( || ( 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
 DESCRIPTION=Compatibility library for accessing secrets
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.16.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9599375a88daf78685ce1db494f14e80
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.2-r1 b/metadata/md5-cache/gnome-base/librsvg-2.40.2-r1
index fe2a40a0e380..a63ef9f99e30 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.2-r1
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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/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(-)?] >=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/libcroco-0.6.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/gdk-pixbuf-2.30.7: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=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(-)?] vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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/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(-)?] >=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/libcroco-0.6.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/gdk-pixbuf-2.30.7: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=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(-)?] vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
@@ -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.2.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=981850d60bc340ecbb7bc4107cec60ba
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.4 b/metadata/md5-cache/gnome-base/librsvg-2.40.4
index 1fd6399ee46a..9ea0cd727599 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.4
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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/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(-)?] >=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/libcroco-0.6.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/gdk-pixbuf-2.30.7: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=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(-)?] vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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/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(-)?] >=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/libcroco-0.6.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/gdk-pixbuf-2.30.7: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=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(-)?] vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
@@ -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.4.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b31d97ab4b544fc2df8aed162d17943a
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.5 b/metadata/md5-cache/gnome-base/librsvg-2.40.5
index 3a639ddb9033..c12952891d3a 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.5
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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/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(-)?] >=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/libcroco-0.6.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/gdk-pixbuf-2.30.7: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=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(-)?] vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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/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(-)?] >=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/libcroco-0.6.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/gdk-pixbuf-2.30.7: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) tools? ( >=x11-libs/gtk+-3.2.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=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(-)?] vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
@@ -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.5.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dee387c64a4551c973c5711ebe5a2ca5
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 03caa5c9f102..92dc83d85d7d 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.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) 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 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.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 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/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=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
 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	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd6f18412d9040a6026de2f9291c0bb5
diff --git a/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.2 b/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.2
index 7fa98cb65ee8..211469250c29 100644
--- a/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.2
+++ b/metadata/md5-cache/gnome-extra/avant-window-navigator-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.16 >=dev-python/pygtk-2.12:2 >=gnome-base/libgtop-2 >=x11-libs/gtk+-2.12:2 >=x11-libs/libdesktop-agnostic-0.3.9[gconf?] >=x11-libs/libwnck-2.22:1 dev-python/dbus-python dev-python/librsvg-python dev-python/pycairo dev-python/pygobject:2 dev-python/pyxdg dev-vcs/bzr x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender gconf? ( >=gnome-base/gconf-2 ) || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.16 >=dev-python/pygtk-2.12:2 >=gnome-base/libgtop-2 >=x11-libs/gtk+-2.12:2 >=x11-libs/libdesktop-agnostic-0.3.9[gconf?] >=x11-libs/libwnck-2.22:1 dev-python/dbus-python dev-python/librsvg-python dev-python/pycairo dev-python/pygobject:2 dev-python/pyxdg dev-vcs/bzr x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender gconf? ( >=gnome-base/gconf-2 ) || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto dev-util/gtk-doc !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A dock-like bar which sits at the bottom of the screen
 EAPI=5
 HOMEPAGE=https://github.com/p12tic/awn
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.16 >=dev-python/pygtk-2.12:2 >=gnome-base/libgtop-2 >=x11-libs/gtk+-2.12:2 >=x11-libs/libdesktop-agnostic-0.3.9[gconf?] >=x11-libs/libwnck-2.22:1 dev-python/dbus-python dev-python/librsvg-python dev-python/pycairo dev-python/pygobject:2 dev-python/pyxdg dev-vcs/bzr x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender gconf? ( >=gnome-base/gconf-2 )
 SLOT=0
 SRC_URI=https://github.com/p12tic/awn/archive/v0.4.2.tar.gz -> avant-window-navigator-0.4.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af61865a7cbe20dbe1cc40f15810dbeb
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.4 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.4
index c27d422e395d..79ab867a46a0 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.4
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( 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=Evolution groupware backend
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/49
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.12/evolution-data-server-3.12.4.tar.xz
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=213d05350d6197c89fc9e12df3129dc5
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.7.1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.7.1
index a8aa31c622ad..ecaaa9fb309b 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.7.1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( 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=Evolution groupware backend
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/49
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.12/evolution-data-server-3.12.7.1.tar.xz
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5304efb9673d58490fcb07edaeae1937
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.6 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.8
similarity index 90%
rename from metadata/md5-cache/gnome-extra/evolution-data-server-3.12.6
rename to metadata/md5-cache/gnome-extra/evolution-data-server-3.12.8
index 7c60f6ba48fb..4f50f47c55c7 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.6
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.12.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5:= >=dev-libs/glib-2.36:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=sys-libs/db-4:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.2:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) || ( >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0= ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-3.5.5 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( 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=Evolution groupware backend
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
@@ -10,6 +10,6 @@ RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.5
 REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/49
-SRC_URI=mirror://gnome/sources/evolution-data-server/3.12/evolution-data-server-3.12.6.tar.xz
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ea1ac31fa703d1f1b61a5740f48fed5f
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.12/evolution-data-server-3.12.8.tar.xz
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=a366436ecbf391813b23ccab3215458b
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.12.6 b/metadata/md5-cache/gnome-extra/evolution-ews-3.12.8
similarity index 86%
rename from metadata/md5-cache/gnome-extra/evolution-ews-3.12.6
rename to metadata/md5-cache/gnome-extra/evolution-ews-3.12.8
index 4de28c3c9b0d..f5634eed49a2 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.12.6
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.12.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.32:2 dev-libs/libical:0= >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.12.6:0= >=mail-client/evolution-3.12.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.5 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.32:2 dev-libs/libical:0= >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.12.8:0= >=mail-client/evolution-3.12.8:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35.5 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.32:2 dev-libs/libical:0= >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.12.6:0= >=mail-client/evolution-3.12.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3
+RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.32:2 dev-libs/libical:0= >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.12.8:0= >=mail-client/evolution-3.12.8:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-ews/3.12/evolution-ews-3.12.6.tar.xz
+SRC_URI=mirror://gnome/sources/evolution-ews/3.12/evolution-ews-3.12.8.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=451a32bb6cb155fec49f1b0d913c6027
+_md5_=91172b44d444d9b06750f0532e431f01
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2
index 182aa6f9f34d..c728a992e166 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.10.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-0.9.6 >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.7 >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.1.7 >=x11-libs/gtk+-3.9:3 >=net-libs/gtk-vnc-0.4.4[gtk3] >=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?] >=app-misc/tracker-0.16:0=[iso] >=media-libs/clutter-gtk-1.3.2:1.0 >=media-libs/clutter-1.11.14:1.0 >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/fuse sys-fs/fuseiso sys-fs/mtools virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.10/gnome-boxes-3.10.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3642ae32807fd961633980c14ffff9eb
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.3
index 028d810c2472..0decf203d16b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.3
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.12.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6 >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.9 >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.1.7 >=x11-libs/gtk+-3.11:3 >=net-libs/gtk-vnc-0.4.4[gtk3] >=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?] >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/fuse sys-fs/fuseiso sys-fs/mtools virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.12/gnome-boxes-3.12.3.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f2a0e82229ccc6ca33cb3ecd2b497f1
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1
index 30cf1ece44c4..1af5738f4e93 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.10.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.9.11:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0 >=x11-libs/libnotify-0.7:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.10/gnome-clocks-3.10.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3764839c686f5bf6f8853b53fbf5e845
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0
index 724be80b6ee7..81343ea40a58 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39:2 >=x11-libs/gtk+-3.12:3 >=media-libs/libcanberra-0.30 >=dev-libs/libgweather-3.9.91:= >=gnome-base/gnome-desktop-3.7.90:= >=sci-geosciences/geocode-glib-0.99.4 >=app-misc/geoclue-1.99.3:2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.12/gnome-clocks-3.12.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a09286678ed5541f5932cd5cc17424e4
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0
index 12c912a071e5..5d989cf1fb1a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libnotify:= >=x11-libs/gtk+-3.12:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.12/gnome-contacts-3.12.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=622ec7036d998b8f26790aa7b76c2146
diff --git a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10 b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10
index 48beae1290a1..70f8c0a4844c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10
+++ b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/libgudev vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) totem? ( media-video/totem ) >=dev-lang/perl-5.8.1 >=dev-util/intltool-0.40.0 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.18.1 ) >=sys-devel/libtool-2.2.6 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/libgudev vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) totem? ( media-video/totem ) >=dev-lang/perl-5.8.1 >=dev-util/intltool-0.40.0 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.18.1 ) >=sys-devel/libtool-2.2.6 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer
 EAPI=4
 HOMEPAGE=https://live.gnome.org/DVBDaemon
 IUSE=nls totem vala
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/libgudev vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) totem? ( media-video/totem ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-0.10.29:0.10 >=media-libs/gst-plugins-good-0.10.14:0.10 >=media-libs/gst-plugins-bad-0.10.13:0.10 >=dev-libs/libgee-0.5:0 >=dev-db/sqlite-3.4 >=media-libs/gst-rtsp-server-0.10.7:0.10 media-plugins/gst-plugins-dvb:0.10 dev-python/gst-python:0.10 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-0.10.8 x11-libs/gtk+:3[introspection] virtual/libgudev vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) totem? ( media-video/totem ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.10.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=945742f3c5752d4d64caa1bb906c3015
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.10.1 b/metadata/md5-cache/gnome-extra/gucharmap-3.10.1
index be10bb1fd3c0..9116228091cf 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.10.1
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( 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
 DESCRIPTION=Unicode character map viewer and library
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Gucharmap
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/3.10/gucharmap-3.10.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b6a2c759debf2b580199f51b183efc2
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.12.1 b/metadata/md5-cache/gnome-extra/gucharmap-3.12.1
index 5070a2428d70..bf88a467d93e 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.12.1
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( 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
 DESCRIPTION=Unicode character map viewer and library
 EAPI=5
 HOMEPAGE=http://live.gnome.org/Gucharmap
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/3.12/gucharmap-3.12.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8a8aca614244d6e055aa807ec5660ac1
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.4 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.6
similarity index 71%
rename from metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.4
rename to metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.6
index e02d8b1ba5d5..d07d3462a0b9 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.4
+++ b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.0.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=prepare setup
-DEPEND=~app-misc/tracker-1.0.4 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
+DEPEND=~app-misc/tracker-1.0.6 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
 DESCRIPTION=Nautilus extension to tag files for Tracker
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=~app-misc/tracker-1.0.4 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
+RDEPEND=~app-misc/tracker-1.0.6 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
 SLOT=0
-SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.4.tar.xz
+SRC_URI=mirror://gnome/sources/tracker/1.0/tracker-1.0.6.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7497be6940ae9442a4ce53d5d09f6be8
+_md5_=089feac6b35310e748f81f8482a40d2c
diff --git a/metadata/md5-cache/gnome-extra/synapse-0.2.10 b/metadata/md5-cache/gnome-extra/synapse-0.2.10
index 6b21b8f7d41b..a3d2a673a50c 100644
--- a/metadata/md5-cache/gnome-extra/synapse-0.2.10
+++ b/metadata/md5-cache/gnome-extra/synapse-0.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) ) || ( dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) ) || ( dev-lang/vala:0.20 ) dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A program launcher in the style of GNOME Do
 EAPI=5
 HOMEPAGE=http://launchpad.net/synapse-project/
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions || ( gnome-extra/zeitgeist[fts] gnome-extra/zeitgeist-extensions[fts] ) )
 SLOT=0
 SRC_URI=http://launchpad.net/synapse-project/0.2/0.2.10/+download/synapse-0.2.10.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdff74f8d11ea92ce96027f2b2da05db
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14
index 5adce9d432ff..9d5b35296934 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/py
 REQUIRED_USE=|| ( python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.14/+download/zeitgeist-0.9.14.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4199c1465210d8a81271eef02c52575
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14-r1 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14-r1
index dd38a76edce4..f5d1274c5fac 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14-r1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.14-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/py
 REQUIRED_USE=|| ( python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.14/+download/zeitgeist-0.9.14.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb0230b522ba0b2bf3c4429845f01412
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5 b/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
index 61a6709038b9..9a37fafc1f97 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-datahub-0.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig
+DEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig
 DESCRIPTION=Provides passive plugins to insert events into zeitgeist
 EAPI=4
 HOMEPAGE=http://launchpad.net/zeitgeist-datahub
@@ -10,5 +10,5 @@ PDEPEND=gnome-extra/zeitgeist
 RDEPEND=!>=gnome-extra/zeitgeist-0.9.12 dev-libs/libzeitgeist >=dev-libs/json-glib-0.14.0 dev-libs/glib:2 x11-libs/gtk+:2 telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-datahub/0.9/0.9.5/+download/zeitgeist-datahub-0.9.5.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b03dfbabd6e13ac1999436cb8a35fb5d
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1 b/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1
index 04926c910887..29f5c1aa9129 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-datasources-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-libs/libzeitgeist x11-libs/gtk+:2 emacs? ( virtual/emacs ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) geany? ( dev-util/geany ) mono? ( dev-util/monodevelop ) telepathy? ( net-libs/telepathy-glib[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygobject[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vim? ( app-editors/vim[python] ) xchat? ( net-irc/xchat-gnome ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-libs/libzeitgeist x11-libs/gtk+:2 emacs? ( virtual/emacs ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) geany? ( dev-util/geany ) mono? ( dev-util/monodevelop ) telepathy? ( net-libs/telepathy-glib[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/dbus-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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygobject[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) vim? ( app-editors/vim[python] ) xchat? ( net-irc/xchat-gnome ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Plugins whose work is to push activities as events into Zeitgeist daemon
 EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist-datasources/ http://zeitgeist-project.com/
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_pyt
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-datasources/0.8/0.8.1/+download/zeitgeist-datasources-0.8.1.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a890d99b753226ec13cb22c450dc04e0
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2
index 7a5f9bdeb3a2..0cc834961e96 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.20 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=LXDE session manager (lite version)
 EAPI=5
 HOMEPAGE=http://lxde.sf.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=911ca8a4881ece4cccf25d4dcb7f583d
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1
index dccbd48bea1f..357a41e91d4a 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.20 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=LXDE session manager (lite version)
 EAPI=5
 HOMEPAGE=http://lxde.sf.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=d5bd26c1bcb822558d1b53c6be7256c2
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2
index 30a88dbbfba8..dd7adf0a3141 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=LXDE session manager (lite version)
 EAPI=5
 HOMEPAGE=http://lxde.sf.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=7d62894cf18865a97611c9fd862999e8
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3 b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
index d3fced81f42c..55c478333d8c 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
+++ b/metadata/md5-cache/lxde-base/lxsession-0.4.9.2-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus || ( dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=LXDE session manager (lite version)
 EAPI=5
 HOMEPAGE=http://lxde.sf.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/libgee:0 dev-libs/dbus-glib lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.4.9.2.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=29b95a82cc5b87f140d6a91cb373486a
diff --git a/metadata/md5-cache/mail-client/evolution-3.12.6 b/metadata/md5-cache/mail-client/evolution-3.12.8
similarity index 65%
rename from metadata/md5-cache/mail-client/evolution-3.12.6
rename to metadata/md5-cache/mail-client/evolution-3.12.8
index 35048cd50692..f0f01d158c1c 100644
--- a/metadata/md5-cache/mail-client/evolution-3.12.6
+++ b/metadata/md5-cache/mail-client/evolution-3.12.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-crypt/gcr-3.4 >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gtk+-3.8.0:3 >=x11-libs/gdk-pixbuf-2.24:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7:= >=gnome-extra/evolution-data-server-3.12.6:=[weather?] >=gnome-extra/gtkhtml-4.5.2:4.0 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.42:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10:= >=net-libs/webkit-gtk-2.0.1:3 x11-libs/libSM x11-libs/libICE crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) map? ( >=app-misc/geoclue-0.12.0:0 >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-crypt/gcr-3.4 >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gtk+-3.8.0:3 >=x11-libs/gdk-pixbuf-2.24:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7:= >=gnome-extra/evolution-data-server-3.12.8:=[weather?] >=gnome-extra/gtkhtml-4.5.2:4.0 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.42:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10:= >=net-libs/webkit-gtk-2.0.1:3 x11-libs/libSM x11-libs/libICE crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) map? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Integrated mail, addressbook and calendaring functionality
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=+bogofilter crypt highlight ldap map spamassassin spell ssl +weather
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-crypt/gcr-3.4 >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gtk+-3.8.0:3 >=x11-libs/gdk-pixbuf-2.24:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7:= >=gnome-extra/evolution-data-server-3.12.6:=[weather?] >=gnome-extra/gtkhtml-4.5.2:4.0 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.42:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10:= >=net-libs/webkit-gtk-2.0.1:3 x11-libs/libSM x11-libs/libICE crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) map? ( >=app-misc/geoclue-0.12.0:0 >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
+RDEPEND=>=app-crypt/gcr-3.4 >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gtk+-3.8.0:3 >=x11-libs/gdk-pixbuf-2.24:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7:= >=gnome-extra/evolution-data-server-3.12.8:=[weather?] >=gnome-extra/gtkhtml-4.5.2:4.0 dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.42:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.10:= >=net-libs/webkit-gtk-2.0.1:3 x11-libs/libSM x11-libs/libICE crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) map? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.8:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.12/evolution-3.12.6.tar.xz
+SRC_URI=mirror://gnome/sources/evolution/3.12/evolution-3.12.8.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=140fb15a385f1a3ee624e4001ffe8ea9
+_md5_=65e6e3044587f649b78a36f0d413162b
diff --git a/metadata/md5-cache/mail-client/geary-0.6.3-r1 b/metadata/md5-cache/mail-client/geary-0.6.3-r1
index 99c8c7e11660..cccc87833abc 100644
--- a/metadata/md5-cache/mail-client/geary-0.6.3-r1
+++ b/metadata/md5-cache/mail-client/geary-0.6.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gcr[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.6.0:3[introspection] x11-libs/libnotify gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.gnome.org/pub/GNOME/sources/geary/0.6/geary-0.6.3.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=01def08e8c20806402dc498405dcec0b
diff --git a/metadata/md5-cache/mail-client/geary-0.7.2-r1 b/metadata/md5-cache/mail-client/geary-0.7.2-r1
index ed80700f3361..a5ddbf69ae4c 100644
--- a/metadata/md5-cache/mail-client/geary-0.7.2-r1
+++ b/metadata/md5-cache/mail-client/geary-0.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gcr[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=ftp://ftp.gnome.org/pub/GNOME/sources/geary/0.7/geary-0.7.2.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=b7ad02c543f3e459fed814b7f64c881b
diff --git a/metadata/md5-cache/mail-client/geary-0.8.0 b/metadata/md5-cache/mail-client/geary-0.8.0
index 553fa37d792a..832d10899ac6 100644
--- a/metadata/md5-cache/mail-client/geary-0.8.0
+++ b/metadata/md5-cache/mail-client/geary-0.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gcr[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=ftp://ftp.gnome.org/pub/GNOME/sources/geary/0.8/geary-0.8.0.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=47e94ea7ef65ccb84d9328b6297e66a0
diff --git a/metadata/md5-cache/mail-client/geary-0.8.1 b/metadata/md5-cache/mail-client/geary-0.8.1
index 07212857847c..a2e9d3920da0 100644
--- a/metadata/md5-cache/mail-client/geary-0.8.1
+++ b/metadata/md5-cache/mail-client/geary-0.8.1
@@ -9,5 +9,5 @@ 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=ftp://ftp.gnome.org/pub/GNOME/sources/geary/0.8/geary-0.8.1.tar.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=a3c2c39c5121a0e8bbbae190debe7608
diff --git a/metadata/md5-cache/mail-client/geary-0.8.2 b/metadata/md5-cache/mail-client/geary-0.8.2
new file mode 100644
index 000000000000..c575af243060
--- /dev/null
+++ b/metadata/md5-cache/mail-client/geary-0.8.2
@@ -0,0 +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.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 )
+DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
+EAPI=5
+HOMEPAGE=http://www.yorba.org/projects/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=ftp://ftp.gnome.org/pub/GNOME/sources/geary/0.8/geary-0.8.2.tar.xz
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
+_md5_=b7465a6d28607f83b7c45a06b472489e
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 8e23d87c6f1b..9c4e1659685c 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
@@ -4,11 +4,11 @@ DESCRIPTION=Scanner Access Now Easy - Backends
 EAPI=5
 HOMEPAGE=http://www.sane-project.org/
 IUSE=avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr -sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 -sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek -sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp -sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 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 ~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 public-domain
 RDEPEND=sane_backends_dc210? ( >=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(-)?] ) sane_backends_dc240? ( >=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(-)?] ) sane_backends_dell1600n_net? ( >=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(-)?] >=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(-)?] ) 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(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-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(-)?] ) usb? ( >=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(-)?] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.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/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(-)?] ) v4l? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) snmp? ( net-analyzer/net-snmp ) systemd? ( sys-apps/systemd:0= ) !<sys-fs/udev-114 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 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	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9500b223348260f008a5e59bb8994f39
+_md5_=7ebbe9dae69b8cc43cf9a53011764561
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.15.1 b/metadata/md5-cache/media-gfx/shotwell-0.15.1
index fa7968ec0a50..4d3e37714874 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.15.1
+++ b/metadata/md5-cache/media-gfx/shotwell-0.15.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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.6.0:3
 SLOT=0
 SRC_URI=http://www.yorba.org/download/shotwell/stable/shotwell-0.15.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=849d09aabd7f6a765d10ca8dea0bb0bf
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.18.0 b/metadata/md5-cache/media-gfx/shotwell-0.18.0
index b225361d035b..c464fc7a1089 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.18.0
+++ b/metadata/md5-cache/media-gfx/shotwell-0.18.0
@@ -9,5 +9,5 @@ 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.6.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.18/shotwell-0.18.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1bb0787afb231d256e88c47c4b377a3b
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.18.1 b/metadata/md5-cache/media-gfx/shotwell-0.18.1
index b17c243d06d7..6f451b03f0ef 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.18.1
+++ b/metadata/md5-cache/media-gfx/shotwell-0.18.1
@@ -9,5 +9,5 @@ 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.6.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.18/shotwell-0.18.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28310191148ace0d51b4fcc2653c2812
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.20.0 b/metadata/md5-cache/media-gfx/shotwell-0.20.0
index 90d70e9f9d9e..8b8cb0b2c1c8 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.20.0
+++ b/metadata/md5-cache/media-gfx/shotwell-0.20.0
@@ -9,5 +9,5 @@ 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.6.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.20/shotwell-0.20.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f474d29e19f0941fc9a1aa5da462c8b
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.20.1 b/metadata/md5-cache/media-gfx/shotwell-0.20.1
index ed4cb76317e6..12529ae0e327 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.20.1
+++ b/metadata/md5-cache/media-gfx/shotwell-0.20.1
@@ -9,5 +9,5 @@ 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.6.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.20/shotwell-0.20.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc3b9309b460797f5f7b94dc1ed5a342
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.20.1-r1 b/metadata/md5-cache/media-gfx/shotwell-0.20.1-r1
index 56fa96c6df7d..01b0e3c79932 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.20.1-r1
+++ b/metadata/md5-cache/media-gfx/shotwell-0.20.1-r1
@@ -9,5 +9,5 @@ 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.6.0:3[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.20/shotwell-0.20.1.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	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e2fd64862f1cf5dea6bb67f0f805fc98
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.20.2 b/metadata/md5-cache/media-gfx/shotwell-0.20.2
index 1353db58717c..f8c127baa5b1 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.20.2
+++ b/metadata/md5-cache/media-gfx/shotwell-0.20.2
@@ -9,5 +9,5 @@ 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.6.0:3[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.20/shotwell-0.20.2.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	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=defa18d3314470be75a8870b9313b195
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.20-r1 b/metadata/md5-cache/media-gfx/ufraw-0.20-r1
index d73b45f5f6e2..83256ee2e451 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.20-r1
+++ b/metadata/md5-cache/media-gfx/ufraw-0.20-r1
@@ -4,10 +4,10 @@ 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
+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 >=media-libs/lensfun-0.2.5 media-libs/libpng:0= media-libs/tiff virtual/jpeg fits? ( sci-libs/cfitsio:0= ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 >=media-gfx/gimp-2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.20.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=633669505dcdc8d24b17ff763a0e8c49
+_md5_=73d2355d2097b415368c894e497d9033
diff --git a/metadata/md5-cache/media-libs/adplug-2.2.1 b/metadata/md5-cache/media-libs/adplug-2.2.1
index cb43bc09dbb8..53960ede1f56 100644
--- a/metadata/md5-cache/media-libs/adplug-2.2.1
+++ b/metadata/md5-cache/media-libs/adplug-2.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=A free, cross-platform, hardware independent AdLib sound player libr
 EAPI=4
 HOMEPAGE=http://adplug.sourceforge.net
 IUSE=debug static-libs
-KEYWORDS=amd64 arm hppa ppc x86
+KEYWORDS=amd64 arm hppa ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-cpp/libbinio-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/adplug/adplug-2.2.1.tar.bz2
-_md5_=31096d041f95ed2d7fc797276c702f5b
+_md5_=fbfcc5c8a0e6df2b54066fbcde5c8aab
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index ede8e0b30654..c75e60d56676 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=4
 HOMEPAGE=http://www.gegl.org/babl/
@@ -7,5 +7,5 @@ IUSE=altivec +introspection sse mmx vala
 LICENSE=LGPL-3
 RDEPEND=introspection? ( >=dev-libs/gobject-introspection-0.10 )
 SLOT=0
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=a56ec76f8e807004afd96b4282a06f34
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index ab929e8ba2ec..0acf4380de45 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
+DEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) >=sys-apps/sed-4 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A graph based image processing framework
 EAPI=4
 HOMEPAGE=http://www.gegl.org/
@@ -7,5 +7,5 @@ IUSE=cairo debug ffmpeg introspection jpeg jpeg2k lensfun mmx openexr png raw sd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=media-libs/babl-0.1.10[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) ffmpeg? ( virtual/ffmpeg ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 SLOT=0
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=a63cc16005a626b25ebe99413cde63aa
diff --git a/metadata/md5-cache/media-libs/grilo-0.2.10 b/metadata/md5-cache/media-libs/grilo-0.2.10
index 10f5d23ec9bd..afb01c501726 100644
--- a/metadata/md5-cache/media-libs/grilo-0.2.10
+++ b/metadata/md5-cache/media-libs/grilo-0.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11
 REQUIRED_USE=test? ( introspection )
 SLOT=0.2/1
 SRC_URI=mirror://gnome/sources/grilo/0.2/grilo-0.2.10.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09f10f5868e974129596bf2adad63a6d
diff --git a/metadata/md5-cache/media-libs/grilo-0.2.11 b/metadata/md5-cache/media-libs/grilo-0.2.11
index 29988829100c..c44324f7e7ab 100644
--- a/metadata/md5-cache/media-libs/grilo-0.2.11
+++ b/metadata/md5-cache/media-libs/grilo-0.2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) media-plugins/grilo-plugins:0.2 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11
 REQUIRED_USE=test? ( introspection )
 SLOT=0.2/1
 SRC_URI=mirror://gnome/sources/grilo/0.2/grilo-0.2.11.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=042b0bf919bec9315cbecf01374fa29d
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2 b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2
index f45eda4a81e2..bf2e98fd6751 100644
--- a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig introspection? ( || ( 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
 DESCRIPTION=Library providing DLNA-related functionality for MediaServers
 EAPI=5
 HOMEPAGE=http://gupnp.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f8266febb40bf1542ae1bb6d2b68e9d7
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.7 b/metadata/md5-cache/media-libs/libchamplain-0.12.7
index 64b2fe9cadb0..dfc6092d471f 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.7
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] media-libs/cogl:= net-libs/libsoup-gnome:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] media-libs/cogl:= net-libs/libsoup-gnome:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( 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
 DESCRIPTION=Clutter based world map renderer
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/libchamplain/
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspect
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.7.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd7095c98b84ec9fba6685c21ab581da
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.8 b/metadata/md5-cache/media-libs/libchamplain-0.12.8
index fff4bbedea67..6a2207b6352c 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.8
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] media-libs/cogl:= >=net-libs/libsoup-2.34:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] media-libs/cogl:= >=net-libs/libsoup-2.34:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( 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
 DESCRIPTION=Clutter based world map renderer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/libchamplain
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspect
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.8.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4530b51782fe5e91a54df13bcf37b887
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.9 b/metadata/md5-cache/media-libs/libchamplain-0.12.9
index 7207c9780549..9163f58cf1f8 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.9
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] media-libs/cogl:= >=net-libs/libsoup-2.34:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/memphis:0.2[introspection?] media-libs/cogl:= >=net-libs/libsoup-2.34:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection ) dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( 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
 DESCRIPTION=Clutter based world map renderer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/libchamplain
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspect
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.9.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab5d6b48c16c1b0065edada4fa5fdede
diff --git a/metadata/md5-cache/media-libs/libmediaart-0.4.0 b/metadata/md5-cache/media-libs/libmediaart-0.4.0
index ed29070bbfe8..3cc1eab73205 100644
--- a/metadata/md5-cache/media-libs/libmediaart-0.4.0
+++ b/metadata/md5-cache/media-libs/libmediaart-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.35.1:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.35.1:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig vala? ( || ( 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=Manages, extracts and handles media art caches
 EAPI=5
 HOMEPAGE=https://github.com/curlybeast/libmediaart
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.35.1:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspec
 REQUIRED_USE=?? ( gtk qt4 qt5 ) vala? ( introspection )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/libmediaart/0.4/libmediaart-0.4.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4b90f852aa29807098b4047425362d9c
diff --git a/metadata/md5-cache/media-libs/libmediaart-0.7.0 b/metadata/md5-cache/media-libs/libmediaart-0.7.0
index c2fc229435db..46c7e6ab2317 100644
--- a/metadata/md5-cache/media-libs/libmediaart-0.7.0
+++ b/metadata/md5-cache/media-libs/libmediaart-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.38.0:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.38.0:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) >=dev-util/gtk-doc-am-1.8 virtual/pkgconfig vala? ( || ( 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=Manages, extracts and handles media art caches
 EAPI=5
 HOMEPAGE=https://github.com/GNOME/libmediaart
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.0:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspec
 REQUIRED_USE=?? ( gtk qt4 qt5 ) vala? ( introspection )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/libmediaart/0.7/libmediaart-0.7.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=aee4c2f68c900128ce07725da7c2c935
diff --git a/metadata/md5-cache/media-libs/memphis-0.2.3 b/metadata/md5-cache/media-libs/memphis-0.2.3
index 4d236e7aac55..9ba2f7b858ae 100644
--- a/metadata/md5-cache/media-libs/memphis-0.2.3
+++ b/metadata/md5-cache/media-libs/memphis-0.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) dev-util/gtk-doc !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection ) vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) dev-util/gtk-doc !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=A map-rendering application and a library for OpenStreetMap
 EAPI=4
 HOMEPAGE=http://trac.openstreetmap.ch/trac/memphis/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/expat dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection )
 SLOT=0.2
 SRC_URI=http://wenner.ch/files/public/mirror/memphis/memphis-0.2.3.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=9d694ab28c2c3c1c93f5175e0b08884a
diff --git a/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
index 7aa2e110a6ed..f0dfe8b7186b 100644
--- a/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-mmkeys-11.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig
+DEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig
 DESCRIPTION=Bind multimedia keys via gnome settings daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Plugins
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/dbus-glib >=media-sound/gmpc-11.8.16
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-mmkeys-11.8.16.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=0afbfb42b4c8faea3e936572e278b893
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16 b/metadata/md5-cache/media-sound/gmpc-11.8.16
index 8b01cf69c0ed..e45c2be26d59 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/gnome-doc-utils >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/gnome-doc-utils >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A GTK+2 client for the Music Player Daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=2d00bc0d9946ed688183ec6029153aa6
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16-r1 b/metadata/md5-cache/media-sound/gmpc-11.8.16-r1
index ec1e7952e76f..aea8386d91f3 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16-r1
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/gnome-doc-utils >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/gnome-doc-utils >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=A GTK+2 client for the Music Player Daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=110d218ff19002e924c26e5c07f7e07b
diff --git a/metadata/md5-cache/media-sound/mpd-0.19.1 b/metadata/md5-cache/media-sound/mpd-0.19.1
index caad13d74fd3..d880a8a6f71d 100644
--- a/metadata/md5-cache/media-sound/mpd-0.19.1
+++ b/metadata/md5-cache/media-sound/mpd-0.19.1
@@ -4,11 +4,11 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=5
 HOMEPAGE=http://www.musicpd.org
 IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms libmpdclient libsamplerate libsoxr +mad mikmod modplug mp4v2 mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip
-KEYWORDS=~amd64 ~arm ~hppa ~sh ~x86 ~x86-fbsd ~x64-macos
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=!<sys-cluster/mpich2-1.4_rc2 adplug? ( media-libs/adplug ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) glib? ( dev-libs/glib:2 ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) mp4v2? ( media-libs/libmp4v2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba[smbclient] ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2 ) libsoxr? ( media-libs/soxr ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) selinux? ( sec-policy/selinux-mpd )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) ao? ( glib ) gme? ( glib ) jack? ( glib ) mp4v2? ( faad ) network? ( || ( audiofile flac lame twolame vorbis ) glib ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) sid? ( glib ) soundcloud? ( glib ) sqlite? ( glib ) opus? ( ogg ) upnp? ( expat ) vorbis? ( glib ) wavpack? ( glib )
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/mpd/0.19/mpd-0.19.1.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b6bcf1a5813d659e30b9078b4ceacd1a
+_md5_=dc2925317955d82ad76515480770cc50
diff --git a/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r2 b/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r2
index 10b1cacf6540..9023f0e10c1f 100644
--- a/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r2
+++ b/metadata/md5-cache/media-sound/vorbis-tools-1.4.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=tools for using the Ogg Vorbis sound file format
 EAPI=5
 HOMEPAGE=http://www.vorbis.com
 IUSE=flac kate nls +ogg123 speex
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvorbis-1.3.0 flac? ( media-libs/flac ) kate? ( media-libs/libkate ) ogg123? ( >=media-libs/libao-1.0.0 net-misc/curl ) speex? ( media-libs/speex )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=24049ccffe8de0a2e49b96edcb2c217e
+_md5_=314a5f2808629663d02919abc08c7e3b
diff --git a/metadata/md5-cache/media-sound/xnoise-9999 b/metadata/md5-cache/media-sound/xnoise-9999
index 60761e2c3c5b..2c80c09a201c 100644
--- a/metadata/md5-cache/media-sound/xnoise-9999
+++ b/metadata/md5-cache/media-sound/xnoise-9999
@@ -7,5 +7,5 @@ IUSE=ayatana +lastfm +lyrics
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.34:2 gnome-base/librsvg:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 dev-db/sqlite:3 >=media-libs/libtaginfo-0.2.0 x11-libs/cairo x11-libs/libX11 ayatana? ( dev-libs/libappindicator:3 ) lastfm? ( net-libs/libsoup:2.4 ) lyrics? ( net-libs/libsoup:2.4 dev-libs/libxml2:2 )
 SLOT=0
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=f6748f2737c38e23b47b095905bf1da7
diff --git a/metadata/md5-cache/media-video/cheese-3.10.2 b/metadata/md5-cache/media-video/cheese-3.10.2
index a5423a110516..336bb1f240ce 100644
--- a/metadata/md5-cache/media-video/cheese-3.10.2
+++ b/metadata/md5-cache/media-video/cheese-3.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-libs/libxml2:2 >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50 virtual/pkgconfig x11-proto/xf86vidmodeproto test? ( dev-libs/glib:2[utils] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/cheese/
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4.4:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/cheese/3.10/cheese-3.10.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ae6399f02b663b646ca4cd3c384b06d9
diff --git a/metadata/md5-cache/media-video/cheese-3.12.2-r1 b/metadata/md5-cache/media-video/cheese-3.12.2-r1
index 8d81123da0c8..bb771bc2acc0 100644
--- a/metadata/md5-cache/media-video/cheese-3.12.2-r1
+++ b/metadata/md5-cache/media-video/cheese-3.12.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/cairo-1.10:= >=x11-libs/pango-1.28.0 >=gnome-base/gnome-desktop-2.91.6:3= >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 >=media-libs/clutter-gst-2.0.6:2.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
 SLOT=0/7
 SRC_URI=mirror://gnome/sources/cheese/3.12/cheese-3.12.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9204ab94032573d484f80d9df6946f18
diff --git a/metadata/md5-cache/media-video/lsdvd-0.17 b/metadata/md5-cache/media-video/lsdvd-0.17
index 76d105e040b8..d1297db1b42d 100644
--- a/metadata/md5-cache/media-video/lsdvd-0.17
+++ b/metadata/md5-cache/media-video/lsdvd-0.17
@@ -3,10 +3,10 @@ DEPEND=media-libs/libdvdread !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/au
 DESCRIPTION=Utility for getting info out of DVDs
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/lsdvd/
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=media-libs/libdvdread
 SLOT=0
 SRC_URI=mirror://sourceforge/lsdvd/lsdvd-0.17.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=0ed4d87eec7d657c19f761363e0b7f0b
+_md5_=2a116f09ac9d62711fd93c15ba7b00cd
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.12.1 b/metadata/md5-cache/net-analyzer/wireshark-1.12.1
index f313e0eb75f0..dcd509f74a3b 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.12.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.12.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 selinux smi ssl zlib +filecaps
 KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt )
 SLOT=0/1.12.1
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.12.1.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fcaps	c247b6885e1ff14f794a0eb65fb1e8ec	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	qmake-utils	ff7bbc3348bb77814b5e2c227f9e4366	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2b7004dc73708aa4fd8713a26f4205d7
+_md5_=149da9bec76e2bfcbfc9f4ea8168f146
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.12.1-r1 b/metadata/md5-cache/net-analyzer/wireshark-1.12.1-r1
index 565405680d48..6c124a8e5d2f 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.12.1-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.12.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux smi ssl zlib +filecaps
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
 SLOT=0/1.12.1
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.12.1.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fcaps	c247b6885e1ff14f794a0eb65fb1e8ec	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	qmake-utils	ff7bbc3348bb77814b5e2c227f9e4366	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=b36eeec8cb37dce4b8627244a1c09aa4
+_md5_=5d4ed1240415934c2f86b8c74fa01b07
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.99.0-r1 b/metadata/md5-cache/net-analyzer/wireshark-1.99.0-r1
index a3ccac33785d..ca1ddd9b59a5 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.99.0-r1
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.99.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap )
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap )
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux smi sse4_2 ssl zlib +filecaps
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
 SLOT=0/1.99.0
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.99.0.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fcaps	c247b6885e1ff14f794a0eb65fb1e8ec	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	qmake-utils	ff7bbc3348bb77814b5e2c227f9e4366	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=876a0515fe8fa2dbd509e9d0c0aae2cc
+_md5_=9dae0013d6eb50882574822e1bebabba
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 30057de5b4e4..ae3ab7fd1d40 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux smi sse4_2 ssl zlib +filecaps
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
+RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils virtual/freedesktop-icon-theme x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[accessibility] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
 SLOT=0/99999999
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fcaps	c247b6885e1ff14f794a0eb65fb1e8ec	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	qmake-utils	ff7bbc3348bb77814b5e2c227f9e4366	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1f20615f32490a3241c880f82f74178c
+_md5_=19b8799a7baaa2f8abaa6029fe98c497
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 dcb492d30eb9..dc8fa1058fa8 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
@@ -3,9 +3,9 @@ DESCRIPTION=C library that resolves names asynchronously
 EAPI=5
 HOMEPAGE=http://c-ares.haxx.se/
 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=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=58e0e62d009e894e3f9af94f9d29c3d6
+_md5_=1f78e52e8fd0be1d5f57f54b9af95940
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.72 b/metadata/md5-cache/net-dns/dnsmasq-2.72
index 426e9623664b..b5f8bdc3b1f1 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.72
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.72
@@ -4,11 +4,11 @@ DESCRIPTION=Small forwarding DNS server
 EAPI=5
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/
 IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua ) conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) s390? ( !conntrack )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.72.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=2c4abf3d488c25ea46cff9745b7b23b2
+_md5_=0f9d2df9df5e65385b36f9e4513b51c9
diff --git a/metadata/md5-cache/net-fs/libnfs-1.9.5 b/metadata/md5-cache/net-fs/libnfs-1.9.5
index 4a783fa6d82f..94cea4c8bf91 100644
--- a/metadata/md5-cache/net-fs/libnfs-1.9.5
+++ b/metadata/md5-cache/net-fs/libnfs-1.9.5
@@ -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 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.5.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4ac487d7e570c4f742b0eaa87de80ece
+_md5_=fa665330ef76ad60db5718218524e9e5
diff --git a/metadata/md5-cache/net-fs/libnfs-9999 b/metadata/md5-cache/net-fs/libnfs-9999
index ae4b6c7fa700..539038b4d6aa 100644
--- a/metadata/md5-cache/net-fs/libnfs-9999
+++ b/metadata/md5-cache/net-fs/libnfs-9999
@@ -7,4 +7,4 @@ IUSE=examples static-libs
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=767269fbce807f81bb13a0a403199110
+_md5_=33729ead5b7ec6cb1f2e317f7d3f59ab
diff --git a/metadata/md5-cache/net-im/birdie-1.1 b/metadata/md5-cache/net-im/birdie-1.1
index 21fad84bb838..a5e387160428 100644
--- a/metadata/md5-cache/net-im/birdie-1.1
+++ b/metadata/md5-cache/net-im/birdie-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 >=dev-libs/granite-0.2.1 dev-libs/json-glib dev-libs/libdbusmenu:3 dev-libs/libgee:0 net-libs/libsoup:2.4 net-libs/rest:0.7 media-libs/libcanberra net-im/pidgin net-libs/webkit-gtk:3 >=x11-libs/gtk+-3.10:3 x11-libs/gtksourceview:3.0 x11-libs/libnotify x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/birdieapp/birdie/archive/1.1.tar.gz -> birdie-1.1.tar.gz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06d4a20c9a1e0592a8e566b7d42fde9f
diff --git a/metadata/md5-cache/net-im/corebird-0.8 b/metadata/md5-cache/net-im/corebird-0.8
index 21b47216a757..0fef32383c50 100644
--- a/metadata/md5-cache/net-im/corebird-0.8
+++ b/metadata/md5-cache/net-im/corebird-0.8
@@ -9,5 +9,5 @@ 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.12:3
 SLOT=0
 SRC_URI=https://github.com/baedert/corebird/archive/0.8.tar.gz -> corebird-0.8.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f101fd4ea1a0cd4f27c0e7cabedbcfed
diff --git a/metadata/md5-cache/net-libs/gssdp-0.14.10 b/metadata/md5-cache/net-libs/gssdp-0.14.10
index 8f173fd9cde1..0a8d39f11103 100644
--- a/metadata/md5-cache/net-libs/gssdp-0.14.10
+++ b/metadata/md5-cache/net-libs/gssdp-0.14.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext >=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(-)?] app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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.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 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext >=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(-)?] app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A GObject-based API for handling resource discovery and announcement over SSDP
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=+introspection +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
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 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.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3
+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.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	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e6eae0e2d938612cbdf6027e3c68bb7b
diff --git a/metadata/md5-cache/net-libs/gssdp-0.14.8-r1 b/metadata/md5-cache/net-libs/gssdp-0.14.8-r1
index 7f16d3bcc2ac..77a7ed8765e8 100644
--- a/metadata/md5-cache/net-libs/gssdp-0.14.8-r1
+++ b/metadata/md5-cache/net-libs/gssdp-0.14.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=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.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext >=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(-)?] app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=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.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 >=dev-util/gtk-doc-am-1.10 sys-devel/gettext >=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(-)?] app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A GObject-based API for handling resource discovery and announcement over SSDP
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=+introspection +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
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 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.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3
+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.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.8.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4714a50449ab28c40d143e0faa2445d4
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.5.2 b/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
index 2522dfb9a410..501dc2360cdc 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils
+DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils
 DESCRIPTION=VNC viewer widget for GTK
 EAPI=5
 HOMEPAGE=https://live.gnome.org/gtk-vnc
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-er
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) vala? ( gtk3 introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1edd8c61bba68671348c1c984016f0cc
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.5.3 b/metadata/md5-cache/net-libs/gtk-vnc-0.5.3
index 82ca6bae4c7f..9f12a07f0f98 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.5.3
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils
+DEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl ) >=dev-lang/perl-5 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=dev-libs/gobject-introspection-0.9.4 ) app-arch/xz-utils
 DESCRIPTION=VNC viewer widget for GTK
 EAPI=5
 HOMEPAGE=https://live.gnome.org/gtk-vnc
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2:0 dev-libs/libgpg-er
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) ) vala? ( gtk3 introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.3.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b8d6dbe1c3a921f7469976810b52437e
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.10 b/metadata/md5-cache/net-libs/gupnp-0.20.10
index 644bfa87b06f..200e3d110fe5 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.10
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
 EAPI=5
 HOMEPAGE=http://gupnp.org/
 IUSE=connman +introspection kernel_linux networkmanager python_targets_python2_7
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.24:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.10.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89cb8ed8403ead6bbfecc7d7e9072f88
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.12 b/metadata/md5-cache/net-libs/gupnp-0.20.12
index 4f1f4df29fd8..9ad60e18c891 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.12
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.28.0:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.28.0:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=connman +introspection kernel_linux networkmanager python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.28.0:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.13.0:0=[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] >=dev-libs/glib-2.28.0:2 dev-libs/libxml2 || ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) connman? ( >=dev-libs/glib-2.28:2 >=net-misc/connman-0.80 ) networkmanager? ( >=dev-libs/glib-2.26:2 ) !net-libs/gupnp-vala
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.12.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d34716a3df43f68b30ce09e2b3f429e
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.12-r1 b/metadata/md5-cache/net-libs/gupnp-0.20.12-r1
index f96e4c574c23..3e802619fb34 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.12-r1
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.12-r1
@@ -1,14 +1,14 @@
 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[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.7: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(-)?] >=net-libs/libsoup-2.44.2:2.4[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/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(-)?] || ( >=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(-)?] <sys-libs/e2fsprogs-libs-1.41.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) connman? ( >=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(-)?] ) networkmanager? ( >=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/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext >=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(-)?] app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.7: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(-)?] >=net-libs/libsoup-2.44.2:2.4[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/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(-)?] || ( >=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(-)?] <sys-libs/e2fsprogs-libs-1.41.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) connman? ( >=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(-)?] ) networkmanager? ( >=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/gupnp-vala >=dev-util/gtk-doc-am-1 sys-devel/gettext >=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(-)?] app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=connman +introspection kernel_linux networkmanager abi_x86_32 abi_x86_64 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
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.7: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(-)?] >=net-libs/libsoup-2.44.2:2.4[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/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(-)?] || ( >=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(-)?] <sys-libs/e2fsprogs-libs-1.41.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) connman? ( >=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(-)?] ) networkmanager? ( >=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/gupnp-vala
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.7: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(-)?] >=net-libs/libsoup-2.44.2:2.4[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/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(-)?] || ( >=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(-)?] <sys-libs/e2fsprogs-libs-1.41.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) connman? ( >=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(-)?] ) networkmanager? ( >=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/gupnp-vala
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.12.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ea73004ebf38cb512e3468a6c899901
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.12.5 b/metadata/md5-cache/net-libs/gupnp-av-0.12.5
index ace19ce04206..e6c5ae85070c 100644
--- a/metadata/md5-cache/net-libs/gupnp-av-0.12.5
+++ b/metadata/md5-cache/net-libs/gupnp-av-0.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( 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
 DESCRIPTION=Utility library aiming to ease the handling UPnP A/V profiles
 EAPI=5
 HOMEPAGE=http://gupnp.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.5.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=39cc63d0167171c690d6fc2c1403659c
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.12.6 b/metadata/md5-cache/net-libs/gupnp-av-0.12.6
index 53fa6dadef3b..93330742f115 100644
--- a/metadata/md5-cache/net-libs/gupnp-av-0.12.6
+++ b/metadata/md5-cache/net-libs/gupnp-av-0.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig introspection? ( || ( 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
 DESCRIPTION=Utility library aiming to ease the handling UPnP A/V profiles
 EAPI=5
 HOMEPAGE=http://gupnp.org/
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !net-libs/gupnp-vala
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.6.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c6aeaf0be421d132d58c94056291ba3
diff --git a/metadata/md5-cache/net-libs/gupnp-vala-0.10.5 b/metadata/md5-cache/net-libs/gupnp-vala-0.10.5
index ea50e9669851..b48b7e6b671b 100644
--- a/metadata/md5-cache/net-libs/gupnp-vala-0.10.5
+++ b/metadata/md5-cache/net-libs/gupnp-vala-0.10.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=prepare
-DEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0 virtual/pkgconfig app-arch/xz-utils
+DEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0 virtual/pkgconfig app-arch/xz-utils
 DESCRIPTION=Vala bindings for the GUPnP framework
 EAPI=4
 HOMEPAGE=http://gupnp.org/
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
-RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0
+RDEPEND=|| ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) >=net-libs/gupnp-0.18 >=net-libs/gssdp-0.12.2[introspection] >=net-libs/gupnp-av-0.9 >=media-libs/gupnp-dlna-0.5.1:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-vala/0.10/gupnp-vala-0.10.5.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3460f9b9d8e987d76b6dd00a8dff2e6f
diff --git a/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1 b/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1
index 8c13568591c0..0f85f8f81d76 100644
--- a/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1
+++ b/metadata/md5-cache/net-libs/libsocialweb-0.25.21-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-base/libgnome-keyring dev-libs/dbus-glib dev-libs/json-glib net-libs/libsoup:2.4 gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) networkmanager? ( net-misc/networkmanager ) !networkmanager? ( connman? ( net-misc/connman ) ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Social web services integration framework
 EAPI=5
 HOMEPAGE=http://git.gnome.org/browse/libsocialweb
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 >=net-libs/rest-0.7.10 gnome-base/gconf:2 gnome-b
 REQUIRED_USE=?? ( connman networkmanager ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsocialweb/0.25/libsocialweb-0.25.21.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47db424ebe0785c98075b11e3a4a8bab
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 a67706d5ab44..7c03298aab3f 100644
--- a/metadata/md5-cache/net-libs/neon-0.30.0-r1
+++ b/metadata/md5-cache/net-libs/neon-0.30.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP and WebDAV client library
 EAPI=5
 HOMEPAGE=http://www.webdav.org/neon/
 IUSE=doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib linguas_cs linguas_de linguas_fr linguas_ja linguas_nn linguas_pl linguas_ru linguas_tr linguas_zh_CN abi_x86_32 abi_x86_64 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 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=expat? ( >=dev-libs/expat-2.1.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(-)?] ) !expat? ( >=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(-)?] ) gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-2.12.23-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(-)?] pkcs11? ( >=dev-libs/pakchois-0.4-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(-)?] ) ) !gnutls? ( 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(-)?] pkcs11? ( >=dev-libs/pakchois-0.4-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(-)?] ) ) ) kerberos? ( >=virtual/krb5-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(-)?] ) libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) nls? ( >=virtual/libintl-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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r8 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0/27
 SRC_URI=http://www.webdav.org/neon/neon-0.30.0.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9dd7df00837ba381e207e4aebee6bb5e
+_md5_=4adb2c78268a869bbdb3616c9c517545
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8 b/metadata/md5-cache/net-libs/serf-1.3.8
index 29ac3d2b8db6..e9980d82724c 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8
+++ b/metadata/md5-cache/net-libs/serf-1.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP client library
 EAPI=5
 HOMEPAGE=https://code.google.com/p/serf/
 IUSE=kerberos
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 SLOT=1
 SRC_URI=https://serf.googlecode.com/svn/src_releases/serf-1.3.8.tar.bz2
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5a0ce3618d2a5ba3864e2184420470ee
+_md5_=c12215da11932eaef966cd94c3952d1c
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.0 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.0
index 583b65ff35f2..b13b81513977 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.24.0
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[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 )
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[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 bindings for the Telepathy D-Bus protocol
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.0.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=08f7388af3bf23f592dc395a522433c3
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.1 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.1
index 07232a8cb804..f49bb4925f0c 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.24.1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[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 )
+DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[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 bindings for the Telepathy D-Bus protocol
 EAPI=5
 HOMEPAGE=http://telepathy.freedesktop.org
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4be2a1ed138c5313706a0270981a8ce3
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.3.1 b/metadata/md5-cache/net-libs/uhttpmock-0.3.1
index 2b347bfba1c5..2915e6418b77 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.3.1
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.31:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig vala? ( || ( 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
 DESCRIPTION=HTTP web service mocking library
 EAPI=5
 HOMEPAGE=http://gitorious.org/uhttpmock/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.31:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.3.1.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=063fa21d1ba38b77865ba8e7df1567a8
diff --git a/metadata/md5-cache/net-mail/notmuch-0.18.2 b/metadata/md5-cache/net-mail/notmuch-0.18.2
index 5771c0329e02..a04a46a15daf 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.18.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
 EAPI=5
 HOMEPAGE=http://notmuchmail.org/
 IUSE=crypt debug doc emacs mutt nmbug python test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-completion-1.9 >=dev-libs/glib-2.22 >=dev-libs/gmime-2.6.7 !=dev-libs/gmime-2.6.19 <dev-libs/xapian-1.3 >=sys-libs/zlib-1.2.5.2 sys-libs/talloc debug? ( dev-util/valgrind ) emacs? ( >=virtual/emacs-23 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) x86? ( >=dev-libs/xapian-1.2.7-r2 ) crypt? ( app-crypt/gnupg ) nmbug? ( dev-vcs/git virtual/perl-File-Temp virtual/perl-Pod-Parser ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) ) test? ( crypt emacs python )
 SLOT=0
 SRC_URI=http://notmuchmail.org/releases/notmuch-0.18.2.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b4ec29f13e6c08109e1d3fae907a00c0
+_md5_=76ef88c2e6eefa9c3efc3be3d6dcf14a
diff --git a/metadata/md5-cache/net-misc/curl-7.39.0 b/metadata/md5-cache/net-misc/curl-7.39.0
index d6a086aa977f..127c66439a72 100644
--- a/metadata/md5-cache/net-misc/curl-7.39.0
+++ b/metadata/md5-cache/net-misc/curl-7.39.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=5
 HOMEPAGE=http://curl.haxx.se/
 IUSE=adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( >=net-nds/openldap-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(-)?] ) ssl? ( curl_ssl_axtls? ( >=net-libs/axtls-1.4.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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3.2.15[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/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[nettle,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/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[-nettle,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/libgcrypt-1.5.3[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(-)?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) curl_ssl_nss? ( >=dev-libs/nss-3.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(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( >=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(-)?] app-misc/ca-certificates ) ) idn? ( >=net-dns/libidn-1.28[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(-)?] ) adns? ( >=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(-)?] ) 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(-)?] ) metalink? ( >=media-libs/libmetalink-0.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(-)?] ) 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(-)?] ) ssh? ( >=net-libs/libssh2-1.4.3[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-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-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.39.0.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1e642c0a62e52e1201039eed6f3e3802
+_md5_=c3b190d4407e193a783206a177ce4ff9
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1 b/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
index 7cbf224df0be..8e81ae1e795b 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.2.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.4 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( 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 virtual/pkgconfig
 DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/go
 REQUIRED_USE=qmi-newest? ( qmi ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/ModemManager/ModemManager-1.2.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc9bcdb240bbe12aed41c9574c42cc43
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.4.0 b/metadata/md5-cache/net-misc/modemmanager-1.4.0
index a77585a0066f..1aac9af780ef 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.4.0
+++ b/metadata/md5-cache/net-misc/modemmanager-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.10 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) mbim? ( >=net-libs/libmbim-1.10 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.6.0:= ) dev-util/gdbus-codegen >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig vala? ( || ( 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 virtual/pkgconfig
 DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=5
 HOMEPAGE=http://cgit.freedesktop.org/ModemManager/ModemManager/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 virtual/libgudev:= introspection? ( >=dev-libs/go
 REQUIRED_USE=qmi-newest? ( qmi ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/ModemManager/ModemManager-1.4.0.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=586da75777dc524879e36c04f93bf0e0
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.10.0 b/metadata/md5-cache/net-misc/networkmanager-0.9.10.0
index bdd05ea409fe..6ad7571883f9 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.10.0
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= sys-libs/readline >=virtual/libgudev-165:= avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= sys-libs/readline >=virtual/libgudev-165:= avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.10.0.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=fb2a92da5fb385b7b96b8b91446e4c38
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1 b/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1
index 2cfce751c394..ace9feddf4b9 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.10.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= >=net-misc/iputils-20121221-r1 sys-libs/readline >=virtual/libgudev-165:= avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= >=net-misc/iputils-20121221-r1 sys-libs/readline >=virtual/libgudev-165:= avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.10.0.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=66fe51cbf2934b6c5adc81d8c7364137
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.10.1_pre20141101 b/metadata/md5-cache/net-misc/networkmanager-0.9.10.1_pre20141101
index db17264b26f1..65d2db8c16fe 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.10.1_pre20141101
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.10.1_pre20141101
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= >=net-misc/iputils-20121221-r1 sys-libs/readline >=virtual/libgudev-165:= bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) zeroconf? ( net-dns/avahi:=[autoipd] ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.26:2.4= >=net-misc/iputils-20121221-r1 sys-libs/readline >=virtual/libgudev-165:= bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) teamd? ( >=net-misc/libteam-1.9 ) zeroconf? ( net-dns/avahi:=[autoipd] ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~pacho/gnome/NetworkManager-0.9.10.1_pre20141101.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=04e06417cb647632d81dcf47671d3aa1
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4 b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
index a6d0be1362e5..97bc44e2f56e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/libgudev:= >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/libgudev:= >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=net-libs/libsoup-2.26:2.4= >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( net-misc/dhcp[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) wimax? ( dev-libs/libnl:1.1= >=net-wireless/wimax-1.5.1 ) !wimax? ( dev-libs/libnl:3= ) virtual/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 doc? ( >=dev-util/gtk-doc-1.8 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) !wimax? ( !=dev-libs/libnl-3.2.20 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 virtual/libgudev:= >=dev-l
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.6.4.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e18af6ab5853fd7be0ab524febf2990
diff --git a/metadata/md5-cache/net-misc/networkmanager-0.9.8.10-r1 b/metadata/md5-cache/net-misc/networkmanager-0.9.8.10-r1
index ad85a2c8f141..6ad24e249c32 100644
--- a/metadata/md5-cache/net-misc/networkmanager-0.9.8.10-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-0.9.8.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= virtual/libgudev:= bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= virtual/libgudev:= bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) nss? ( >=dev-libs/nss-3.11:= ) dhclient? ( =net-misc/dhcp-4*[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-2.6.29 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) test? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) app-arch/xz-utils virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=Universal network configuration daemon for laptops, desktops, servers and virtualization hosts
 EAPI=5
 HOMEPAGE=http://projects.gnome.org/NetworkManager/
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.94 >=dev-libs/glib-2.30 >=dev
 REQUIRED_USE=modemmanager? ( ppp ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.8.10.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	gnome.org	8fef8f967214f56e08fa92d61163d891	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8d3f5c70c24740968bb19b621d3342c0
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.20-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.20-r1
index b9c454b4bbb7..bbff0960c7b6 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.20-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.20-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.101 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.101 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=5
 HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_pyt
 REQUIRED_USE=python_targets_python2_7 ?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.20.tar.bz2
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=3574b876400f61979960400bc61d4ad3
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.21 b/metadata/md5-cache/net-misc/spice-gtk-0.21
index 8fce8af42cc1..899437f12d1a 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.21
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.21
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/libcacard ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=5
 HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_pyt
 REQUIRED_USE=python_targets_python2_7 ?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.21.tar.bz2
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=8abdfe709c161e4339b7b032d3e8546e
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.25-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
index c757ce75cb7d..9b1ff2ce57b6 100644
--- a/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.25-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[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_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.2 virtual/jpeg sys-libs/zlib dbus? ( dev-libs/dbus-glib ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav ) dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.12* >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
 EAPI=5
 HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 dev-lang/python-exec:=[python_targets_pyt
 REQUIRED_USE=python_targets_python2_7 ?? ( pulseaudio gstreamer )
 SLOT=0
 SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.25.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=d3c1bb68e973c4486e0464dc898098c8
diff --git a/metadata/md5-cache/net-misc/vinagre-3.12.2 b/metadata/md5-cache/net-misc/vinagre-3.12.2
index 228c1e81d232..c5c2c512db87 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.12.2
+++ b/metadata/md5-cache/net-misc/vinagre-3.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) >=dev-lang/perl-5 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) >=dev-lang/perl-5 >=dev-util/intltool-0.50 >=sys-devel/gettext-0.17 virtual/pkgconfig || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=VNC client for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.90 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.12/vinagre-3.12.2.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ca9cddfae131028227d0b5ed996d4aa
diff --git a/metadata/md5-cache/net-nds/ypbind-1.37.2 b/metadata/md5-cache/net-nds/ypbind-1.37.2
index dbd338198ed4..87f630e83582 100644
--- a/metadata/md5-cache/net-nds/ypbind-1.37.2
+++ b/metadata/md5-cache/net-nds/ypbind-1.37.2
@@ -4,10 +4,10 @@ DESCRIPTION=Multithreaded NIS bind service (ypbind-mt)
 EAPI=5
 HOMEPAGE=http://www.linux-nis.org/nis/ypbind-mt/index.html
 IUSE=debug dbus nls slp systemd
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=debug? ( dev-libs/dmalloc ) dbus? ( dev-libs/dbus-glib ) slp? ( net-libs/openslp ) systemd? ( net-nds/rpcbind >=net-nds/yp-tools-2.12-r1 sys-apps/systemd ) !systemd? ( net-nds/yp-tools || ( net-nds/portmap net-nds/rpcbind ) )
 SLOT=0
 SRC_URI=http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-1.37.2.tar.bz2
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=6b6129ec9c2f40af1b40e183e0a31947
+_md5_=fc5067b2e50d0cf047322433f07c73ea
diff --git a/metadata/md5-cache/net-news/rawdog-2.19 b/metadata/md5-cache/net-news/rawdog-2.19
index d1d5bca9e0f0..c43e5ef225f4 100644
--- a/metadata/md5-cache/net-news/rawdog-2.19
+++ b/metadata/md5-cache/net-news/rawdog-2.19
@@ -4,11 +4,11 @@ DESCRIPTION=Rawdog - RSS Aggregator Without Delusions Of Grandeur
 EAPI=5
 HOMEPAGE=http://offog.org/code/rawdog.html http://pypi.python.org/pypi/rawdog
 IUSE=python_targets_python2_7 python_targets_pypy
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ~s390 sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.19.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	fef838277e0f17df29d4951b7183d1b4	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=4366b66ced5bc52955c160965111ce47
+_md5_=83cd96d1b793fb23e3b3b0bbca078e49
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.0.2 b/metadata/md5-cache/net-proxy/squid-3.5.0.2
new file mode 100644
index 000000000000..3bb27a22c48c
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/squid-3.5.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle net-libs/gnutls ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool ecap? ( virtual/pkgconfig ) sys-apps/ed test? ( dev-util/cppunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=A full-featured web proxy cache
+EAPI=5
+HOMEPAGE=http://www.squid-cache.org/
+IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl dev-libs/nettle net-libs/gnutls ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
+SLOT=0
+SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.0.2.tar.xz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bcfa03ac72319ff7f751461c616205f5
diff --git a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0 b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
index cfcabfd0d8db..91a129b67eca 100644
--- a/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
+++ b/metadata/md5-cache/sci-geosciences/gpx-viewer-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) >=dev-util/intltool-0.21 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) >=dev-util/intltool-0.21 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Simple program to visualize a gpx file
 EAPI=4
 HOMEPAGE=http://blog.sarine.nl/gpx-viewer/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gdl:3 dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libchamplain:0.12[gtk] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=http://edge.launchpad.net/gpx-viewer/trunk/0.2.0/+download/gpx-viewer-0.3.0.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a2f7835fda927c9645229e923979be1
diff --git a/metadata/md5-cache/sys-apps/rng-tools-4-r7 b/metadata/md5-cache/sys-apps/rng-tools-4-r7
index f2e22ad7a84c..019cbbb919f6 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-4-r7
+++ b/metadata/md5-cache/sys-apps/rng-tools-4-r7
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon to use hardware random number generators
 EAPI=5
 HOMEPAGE=http://gkernel.sourceforge.net/
 IUSE=selinux
-KEYWORDS=alpha amd64 ~ia64 ppc x86
+KEYWORDS=alpha amd64 ia64 ppc x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-rngd )
 SLOT=0
 SRC_URI=mirror://sourceforge/gkernel/rng-tools-4.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9211310f56cef5316dec5cb5a96c0eb6
+_md5_=ba7760c28c160516084fb0a079d0dbf1
diff --git a/metadata/md5-cache/sys-apps/smartmontools-6.3 b/metadata/md5-cache/sys-apps/smartmontools-6.3
index 6c260ec074aa..4af4771d5d7a 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-6.3
+++ b/metadata/md5-cache/sys-apps/smartmontools-6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T
 EAPI=4
 HOMEPAGE=http://smartmontools.sourceforge.net/
 IUSE=caps minimal selinux static
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=caps? ( static? ( sys-libs/libcap-ng[static-libs] ) !static? ( sys-libs/libcap-ng ) ) selinux? ( sys-libs/libselinux ) !minimal? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-6.3.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=135c628681e8f3bcde2289d5519c3b28
+_md5_=286e37a7e42a6cb3219f26ec29e41082
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-3 b/metadata/md5-cache/sys-apps/systemd-ui-3
index b3c5a9e8d151..4b9b4770f26a 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-3
+++ b/metadata/md5-cache/sys-apps/systemd-ui-3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26:2 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:3 >=x11-libs/libnotify-0.7
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-ui-3.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=0498e1a5a08c36e22b8514fa081767f0
diff --git a/metadata/md5-cache/sys-apps/systemd-ui-9999 b/metadata/md5-cache/sys-apps/systemd-ui-9999
index eae5bedd9164..ad13979d6ad0 100644
--- a/metadata/md5-cache/sys-apps/systemd-ui-9999
+++ b/metadata/md5-cache/sys-apps/systemd-ui-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
 LICENSE=GPL-2
 RDEPEND=!sys-apps/systemd[gtk] >=dev-libs/glib-2.26 dev-libs/libgee:0.8 sys-apps/dbus x11-libs/gtk+:3 >=x11-libs/libnotify-0.7
 SLOT=0
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=fc8154ae529582ec53bd2862fa558043
diff --git a/metadata/md5-cache/sys-apps/uevt-2.3-r1 b/metadata/md5-cache/sys-apps/uevt-2.3-r1
index 24755e6e457d..6e56a79baea6 100644
--- a/metadata/md5-cache/sys-apps/uevt-2.3-r1
+++ b/metadata/md5-cache/sys-apps/uevt-2.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=postinst prepare setup
-DEPEND=>=dev-libs/glib-2.28 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.28 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=UPower/UDisks Event, a lightweight desktop-independent power and disk manager
 EAPI=5
 HOMEPAGE=http://elentir.sleipnir.fr/ http://git.sleipnir.fr/uevt/
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.28 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 >=sys-fs/udisks-1.0.5:0 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )
 SLOT=0
 SRC_URI=http://ftp.sleipnir.fr/uevt/uevt-2.3.tar.bz2
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=4edc84f959e98dc297124510ce8a196a
diff --git a/metadata/md5-cache/sys-auth/polkit-0.112-r2 b/metadata/md5-cache/sys-auth/polkit-0.112-r2
index 40107eec6a53..a0e03f950ffd 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.112-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.112-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Policy framework for controlling privileges for system-wide services
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/polkit
 IUSE=examples gtk +introspection jit kde nls pam selinux systemd
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 PDEPEND=gtk? ( || ( >=gnome-extra/polkit-gnome-0.105 lxde-base/lxpolkit ) ) kde? ( sys-auth/polkit-kde-agent ) !systemd? ( sys-auth/consolekit[policykit] )
 RDEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) !hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug,jit=] ) ) ) >=dev-libs/glib-2.32 >=dev-libs/expat-2:= introspection? ( >=dev-libs/gobject-introspection-1 ) pam? ( sys-auth/pambase virtual/pam ) systemd? ( sys-apps/systemd:0= ) selinux? ( sec-policy/selinux-policykit )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=38ab2330c61bba5c99537015198cd13d
+_md5_=56a711ca923ab324257a7509695414f6
diff --git a/metadata/md5-cache/sys-block/parted-3.2 b/metadata/md5-cache/sys-block/parted-3.2
index e0a474ae66d4..d9bb33754bf2 100644
--- a/metadata/md5-cache/sys-block/parted-3.2
+++ b/metadata/md5-cache/sys-block/parted-3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/parted
 IUSE=+debug device-mapper nls readline selinux static-libs
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7 device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2 ) selinux? ( sys-libs/libselinux )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.2.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=96cbcbf126b272d9afb9f4152604f11a
+_md5_=d34bbdb444acb660b755f9d973d7e6c9
diff --git a/metadata/md5-cache/sys-devel/gdb-7.7.1 b/metadata/md5-cache/sys-devel/gdb-7.7.1
index 69d0184c25ec..4f6e0b8e0cee 100644
--- a/metadata/md5-cache/sys-devel/gdb-7.7.1
+++ b/metadata/md5-cache/sys-devel/gdb-7.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU debugger
 EAPI=4
 HOMEPAGE=http://sourceware.org/gdb/
 IUSE=+client expat lzma multitarget nls +python +server test vanilla zlib 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 ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) 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_2(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) zlib? ( sys-libs/zlib )
 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://gnu/gdb/gdb-7.7.1.tar.bz2 ftp://sourceware.org/pub/gdb/releases/gdb-7.7.1.tar.bz2 mirror://gentoo/gdb-7.7.1-patches-1.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=eda3e1ce92a8a343ed6ccd1fb453d801
+_md5_=40fb6333803a5764d8598d40288d1a61
diff --git a/metadata/md5-cache/sys-devel/make-4.0-r1 b/metadata/md5-cache/sys-devel/make-4.0-r1
index c92b4f50c9cb..b2bf47fb66c2 100644
--- a/metadata/md5-cache/sys-devel/make-4.0-r1
+++ b/metadata/md5-cache/sys-devel/make-4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard tool to compile source trees
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/make/make.html
 IUSE=guile nls static
-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
+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=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.0.tar.bz2
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fcb857653fa307080d6ea0f8165a39fa
+_md5_=046139d5b5598849d53913bf042272b5
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-3.2.1 b/metadata/md5-cache/sys-fs/xfsprogs-3.2.1
index d7c5b2949b11..8eefa88017c7 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-3.2.1
+++ b/metadata/md5-cache/sys-fs/xfsprogs-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=xfs filesystem utilities
 EAPI=4
 HOMEPAGE=http://oss.sgi.com/projects/xfs/
 IUSE=libedit nls readline static static-libs
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=!static? ( >=sys-apps/util-linux-2.17.2 readline? ( sys-libs/readline ) !readline? ( libedit? ( dev-libs/libedit ) ) ) !<sys-fs/xfsdump-3
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-3.2.1.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/xfsprogs-3.2.1.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c8c5ddf8a1822995621397c5d502531b
+_md5_=3346a520d7e0e530b94851f9d2fa9731
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.12.31_p45 b/metadata/md5-cache/sys-kernel/rt-sources-3.12.31_p45
new file mode 100644
index 000000000000..a57f9094c69a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.12.31_p45
@@ -0,0 +1,15 @@
+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 Linux 3.12 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=5
+HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svnwiki/selibre/linux-libre/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.12.31_p45
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.31.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-3.12 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.12.N/deblob-check -> deblob-check-3.12 ) mirror://kernel/linux/kernel/projects/rt/3.12/patch-3.12.31-rt45.patch.xz mirror://kernel/linux/kernel/projects/rt/3.12/older/patch-3.12.31-rt45.patch.xz
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7eae136e41d38c837fcea91ee61145a7
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.14.23_p20 b/metadata/md5-cache/sys-kernel/rt-sources-3.14.23_p20
new file mode 100644
index 000000000000..5c9a500d712f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.14.23_p20
@@ -0,0 +1,15 @@
+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 Linux 3.14 kernel sources with the CONFIG_PREEMPT_RT patch
+EAPI=5
+HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/ http://www.kernel.org/pub/linux/kernel/projects/rt/ http://www.fsfla.org/svnwiki/selibre/linux-libre/
+IUSE=symlink build deblob
+KEYWORDS=~amd64
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.23_p20
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.23.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) mirror://kernel/linux/kernel/projects/rt/3.14/patch-3.14.23-rt20.patch.xz mirror://kernel/linux/kernel/projects/rt/3.14/older/patch-3.14.23-rt20.patch.xz
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=64376201e40e179fe08d1a611b133af2
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.10 b/metadata/md5-cache/sys-libs/libosinfo-0.2.10
index bb062b7ab565..0bd1a3d9b5cc 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.10
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) ) virtual/pkgconfig
 DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/libosinfo/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-li
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.10.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=ad4604cbece7bc871a42f8637ce1108a
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.2.11 b/metadata/md5-cache/sys-libs/libosinfo-0.2.11
index 7b107e38497e..189296241a6a 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-0.2.11
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-libs/libsoup-gnome:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-libs/gobject-introspection-common >=dev-util/gtk-doc-am-1.10 virtual/pkgconfig test? ( dev-libs/check ) vala? ( || ( 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 virtual/pkgconfig
 DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=5
 HOMEPAGE=http://libosinfo.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= net-li
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.2.11.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09727660f8cf7e826bfddf2d8ed1643b
diff --git a/metadata/md5-cache/sys-process/htop-1.0.3 b/metadata/md5-cache/sys-process/htop-1.0.3
index d62eff43eacc..c7112718700a 100644
--- a/metadata/md5-cache/sys-process/htop-1.0.3
+++ b/metadata/md5-cache/sys-process/htop-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=interactive process viewer
 EAPI=5
 HOMEPAGE=http://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux oom openvz unicode vserver
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses[unicode?]
 SLOT=0
 SRC_URI=http://hisham.hm/htop/releases/1.0.3/htop-1.0.3.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b1bf7dd1078a21401ff6f5d1867e67cc
+_md5_=c3baa7f8cbb609efd6c6236f3bb16c43
diff --git a/metadata/md5-cache/www-client/lynx-2.8.8_p2 b/metadata/md5-cache/www-client/lynx-2.8.8_p2
index 18f9bd4482f9..c880c34273d0 100644
--- a/metadata/md5-cache/www-client/lynx-2.8.8_p2
+++ b/metadata/md5-cache/www-client/lynx-2.8.8_p2
@@ -4,10 +4,10 @@ DESCRIPTION=An excellent console-based web browser with ssl support
 EAPI=5
 HOMEPAGE=http://lynx.isc.org/
 IUSE=bzip2 cjk gnutls idn ipv6 nls ssl unicode
-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 ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses[unicode?] sys-libs/zlib nls? ( virtual/libintl ) ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8 ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-2.6.4 ) ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn )
 SLOT=0
 SRC_URI=http://lynx.isc.org/current/lynx2.8.8rel.2.tar.bz2
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3dc34834d9978b61b7764470a0b3f549
+_md5_=14abb8378ccfc3793929fc15d78b76ea
diff --git a/metadata/md5-cache/www-client/midori-0.5.5 b/metadata/md5-cache/www-client/midori-0.5.5
index 5ad416432d68..33d48bb9c032 100644
--- a/metadata/md5-cache/www-client/midori-0.5.5
+++ b/metadata/md5-cache/www-client/midori-0.5.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.34:2.4 >=net-libs/libsoup-gnome-2.34:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver >=net-libs/webkit-gtk-1.8.3:2 >=x11-libs/gtk+-2.24:2 unique? ( dev-libs/libunique:1 ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.5_all_.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
 _md5_=ccd1292e5fb5f63456ecf43bc54c0823
diff --git a/metadata/md5-cache/www-client/midori-0.5.8 b/metadata/md5-cache/www-client/midori-0.5.8
index ef7a79f3eeb6..8d555af2e1a4 100644
--- a/metadata/md5-cache/www-client/midori-0.5.8
+++ b/metadata/md5-cache/www-client/midori-0.5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool gnome-base/librsvg sys-devel/gettext doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool gnome-base/librsvg sys-devel/gettext doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=5
 HOMEPAGE=http://www.midori-browser.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-l
 REQUIRED_USE=granite? ( !deprecated ) introspection? ( deprecated ) webkit2? ( !deprecated )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.8_all_.tar.bz2
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=90869cfe77bf4d8d9b1cda10995e3ed7
diff --git a/metadata/md5-cache/www-client/midori-0.5.8-r1 b/metadata/md5-cache/www-client/midori-0.5.8-r1
index 77403fd373c2..af44a77d1ca3 100644
--- a/metadata/md5-cache/www-client/midori-0.5.8-r1
+++ b/metadata/md5-cache/www-client/midori-0.5.8-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) dev-util/intltool gnome-base/librsvg sys-devel/gettext doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4 >=net-libs/libsoup-gnome-2.38:2.4 >=x11-libs/libnotify-0.7 x11-libs/libXScrnSaver deprecated? ( >=net-libs/webkit-gtk-1.8.1:2[jit=] >=x11-libs/gtk+-2.24:2 ) !deprecated? ( >=app-crypt/gcr-3 x11-libs/gtk+:3 webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] ) !webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] ) ) granite? ( >=dev-libs/granite-0.2 ) introspection? ( dev-libs/gobject-introspection ) zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-util/intltool gnome-base/librsvg sys-devel/gettext doc? ( dev-util/gtk-doc ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight web browser based on WebKitGTK+
 EAPI=5
 HOMEPAGE=http://www.midori-browser.org/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.32.3 dev-libs/libxml2 >=net-l
 REQUIRED_USE=granite? ( !deprecated ) introspection? ( deprecated ) webkit2? ( !deprecated )
 SLOT=0
 SRC_URI=http://www.midori-browser.org/downloads/midori_0.5.8_all_.tar.bz2 http://dev.gentoo.org/~ssuominen/midori-0.5.8-save_as.patch.xz
-_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	fa6c2a74651117877e00388c61d6ef99	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=4fb6373ffe5105cdbce9c793b4685b9f
diff --git a/metadata/md5-cache/x11-libs/colord-gtk-0.1.25 b/metadata/md5-cache/x11-libs/colord-gtk-0.1.25
index dac506fdf005..699fbf9b974c 100644
--- a/metadata/md5-cache/x11-libs/colord-gtk-0.1.25
+++ b/metadata/md5-cache/x11-libs/colord-gtk-0.1.25
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) app-arch/xz-utils dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) )
+DEPEND=>=dev-libs/glib-2.28:2 >=media-libs/lcms-2.2:2= x11-libs/gdk-pixbuf:2[introspection?] x11-libs/gtk+:3[X(+),introspection?] x11-misc/colord:=[introspection?,vala?] introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) app-arch/xz-utils dev-libs/libxslt >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) )
 DESCRIPTION=GTK support library for colord
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-gtk-0.1.25.tar.xz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=365efa94ff8e899531ece9016c1420b5
diff --git a/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92 b/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92
index 89602cfa1b44..a18fea7d8a52 100644
--- a/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92
+++ b/metadata/md5-cache/x11-libs/libdesktop-agnostic-0.3.92
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=dev-libs/glib-2 dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) dev-libs/gobject-introspection introspection? ( x11-libs/gtk+:2[introspection] ) =dev-lang/python-2.7* dev-lang/python !dev-lang/python[-threads]
+DEPEND=>=dev-libs/glib-2 dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] ) dev-libs/gobject-introspection introspection? ( x11-libs/gtk+:2[introspection] ) =dev-lang/python-2.7* dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=A desktop-agnostic library for GLib-based projects
 EAPI=4
 HOMEPAGE=https://launchpad.net/libdesktop-agnostic
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-python/pygobject:2 dev-python/pygtk:2 x11-libs/gtk+:2 gconf? ( gnome-base/gconf:2 ) glade? ( gnome-base/libglade:2.0 ) gnome? ( gnome-base/gnome-desktop:2 ) =dev-lang/python-2.7*
 SLOT=0
 SRC_URI=http://launchpad.net/libdesktop-agnostic/0.4/0.3.92/+download/libdesktop-agnostic-0.3.92.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
 _md5_=86a2864e8853d3797d81bcf7db432cfb
diff --git a/metadata/md5-cache/x11-libs/libfm-1.1.4 b/metadata/md5-cache/x11-libs/libfm-1.1.4
index 29e15c569d6a..54739a11c924 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.1.4
+++ b/metadata/md5-cache/x11-libs/libfm-1.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3
 REQUIRED_USE=udisks? ( automount )
 SLOT=0/4.7.1
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.1.4.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=ce1b0ae67438f707323cbfcb9d57e503
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.2.1 b/metadata/md5-cache/x11-libs/libfm-1.2.2.1
index b6ae1720e3a0..de3b1236ca28 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.2.1
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 >=lxde-base/menu-cache-0.3
 REQUIRED_USE=udisks? ( automount )
 SLOT=0/4.2.0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.2.2.1.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=054b55d2458a398d7c1c8064453bd45d
diff --git a/metadata/md5-cache/x11-libs/libfm-1.2.3 b/metadata/md5-cache/x11-libs/libfm-1.2.3
index 66a2e25302c8..6186fb3dd5d0 100644
--- a/metadata/md5-cache/x11-libs/libfm-1.2.3
+++ b/metadata/md5-cache/x11-libs/libfm-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) doc? ( dev-util/gtk-doc ) app-arch/xz-utils >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/4.3.0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/libfm-1.2.3.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=7cecfa454ffc8e7f899d9842c34adeb9
diff --git a/metadata/md5-cache/x11-libs/libfm-9999 b/metadata/md5-cache/x11-libs/libfm-9999
index 6500f96851cb..8e6f57f043bf 100644
--- a/metadata/md5-cache/x11-libs/libfm-9999
+++ b/metadata/md5-cache/x11-libs/libfm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
+DEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= vala? ( || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) ) doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 virtual/pkgconfig sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool dev-vcs/git
 DESCRIPTION=A library for file management
 EAPI=5
 HOMEPAGE=http://pcmanfm.sourceforge.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) >=lxde-base/menu-cache-0.3.2:= !lxde-base/lxshortcut x11-misc/shared-mime-info automount? ( udisks? ( gnome-base/gvfs[udev,udisks] ) !udisks? ( gnome-base/gvfs[udev] ) ) exif? ( media-libs/libexif )
 REQUIRED_USE=udisks? ( automount ) doc? ( gtk )
 SLOT=0/4.3.0
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=ff7decea5311908bb9fc45b00ba6a523
diff --git a/metadata/md5-cache/x11-misc/alltray-0.7.5.1 b/metadata/md5-cache/x11-misc/alltray-0.7.5.1
index ae269ff92cfa..018c23878c1e 100644
--- a/metadata/md5-cache/x11-misc/alltray-0.7.5.1
+++ b/metadata/md5-cache/x11-misc/alltray-0.7.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=An application which allows any application to be docked into the system notification area
 EAPI=4
 HOMEPAGE=http://alltray.trausch.us/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1
 SLOT=0
 SRC_URI=http://code.launchpad.net/alltray/trunk/0.7.5.1dev/+download/alltray-0.7.5.1dev.tar.gz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5
 _md5_=825cc2e6be08b4d6a341659843ee3d6f
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.1-r1 b/metadata/md5-cache/x11-misc/colord-1.2.1-r1
index 0c644c2039c1..80408fb4ec82 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.1-r1
+++ b/metadata/md5-cache/x11-misc/colord-1.2.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.5:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.5:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( 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 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -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.1.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7752feb35c9ac73fb9a4a20ddb1fbfd4
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.3 b/metadata/md5-cache/x11-misc/colord-1.2.3
index 7cd766190795..c233d74a634b 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.3
+++ b/metadata/md5-cache/x11-misc/colord-1.2.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.6:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.6:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( 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 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -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.3.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5df18d3cd39cc27026dc744e63f7942
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.4 b/metadata/md5-cache/x11-misc/colord-1.2.4
index c9d5f68ff751..18634427a62e 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.4
+++ b/metadata/md5-cache/x11-misc/colord-1.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.6:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=media-libs/lcms-2.6:2= gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) policykit? ( >=sys-auth/polkit-0.103 ) scanner? ( media-gfx/sane-backends ) systemd? ( >=sys-apps/systemd-44:0= ) udev? ( virtual/udev virtual/libgudev:= virtual/libudev:= ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) vala? ( || ( 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 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System service to accurately color manage input and output devices
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/software/colord/
@@ -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.4.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ff43e593ec036ac89b64b89a68bedc95
diff --git a/metadata/md5-cache/x11-misc/dockmanager-0.1.0 b/metadata/md5-cache/x11-misc/dockmanager-0.1.0
index 46d029d3914f..ed95b30703dc 100644
--- a/metadata/md5-cache/x11-misc/dockmanager-0.1.0
+++ b/metadata/md5-cache/x11-misc/dockmanager-0.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/dbus-glib dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libdesktop-agnostic || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2*
+DEPEND=dev-libs/dbus-glib dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libdesktop-agnostic || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2*
 DESCRIPTION=dock-independent helper scripts
 EAPI=3
 HOMEPAGE=https://launchpad.net/dockmanager
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libdesktop-agnostic =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://launchpad.net/dockmanager/trunk/0.1.0/+download/dockmanager-0.1.0.tar.gz
-_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=60323da4b3f4042e4aca6499353add17
diff --git a/metadata/md5-cache/x11-misc/synergy-1.6.1 b/metadata/md5-cache/x11-misc/synergy-1.6.1
index 5a13adc70f46..d5ed74469c3f 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.6.1
+++ b/metadata/md5-cache/x11-misc/synergy-1.6.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/crypto++-5.6.2 net-dns/avahi[mdnsresponder-compat] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) test? ( >=dev-cpp/gmock-1.6.0 ) x11-proto/kbproto x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-libs/crypto++-5.6.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat] ) test? ( >=dev-cpp/gmock-1.6.0 ) x11-proto/kbproto x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Lets you easily share a single mouse and keyboard between multiple computers
 EAPI=5
 HOMEPAGE=http://synergy-project.org/ https://github.com/synergy/synergy
 IUSE=qt4 test
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/crypto++-5.6.2 net-dns/avahi[mdnsresponder-compat] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt4? ( !x11-misc/qsynergy )
+RDEPEND=>=dev-libs/crypto++-5.6.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXtst qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat] ) qt4? ( !x11-misc/qsynergy )
 SLOT=0
 SRC_URI=https://github.com/synergy/synergy/archive/1.6.1.tar.gz -> synergy-1.6.1.tar.gz http://dev.gentoo.org/~hasufell/distfiles/synergy.png
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	qmake-utils	ff7bbc3348bb77814b5e2c227f9e4366	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=df9e7cf483ee418b6044048b1b412c59
+_md5_=17cd979017dcdffdbcd8dd55bd28b327
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.30 b/metadata/md5-cache/x11-misc/xscreensaver-5.30
index 352344680776..7ef899e64683 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.30
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.30
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=5
 HOMEPAGE=http://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login opengl pam +perl selinux suid xinerama
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.30.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=01ebdf3404090689233c7f813d24bbfa
+_md5_=b9f7bbd51beb2fa247f7d66407f07efe
diff --git a/metadata/md5-cache/x11-terms/valaterm-0.6 b/metadata/md5-cache/x11-terms/valaterm-0.6
index fc98d71e4e61..ff046aee5ef7 100644
--- a/metadata/md5-cache/x11-terms/valaterm-0.6
+++ b/metadata/md5-cache/x11-terms/valaterm-0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:3 x11-libs/vte:2.90 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 dev-lang/vala:0.18 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-lang/python !dev-lang/python[-threads]
+DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:3 x11-libs/vte:2.90 || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-lang/python !dev-lang/python[-threads]
 DESCRIPTION=A lightweight vala based terminal
 EAPI=4
 HOMEPAGE=http://gitorious.org/valaterm
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:3 x11-libs/vte:2.90
 SLOT=0
 SRC_URI=http://gitorious.org/valaterm/valaterm/archive-tarball/0.6 -> valaterm-0.6.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	waf-utils	8ba4703b0e4f03e42a8f6e7b8aabd9e6
 _md5_=b7386ea307ebcfdb0e9a927411742682
diff --git a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3 b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3
index f4d3c31b596b..f627a0afd50f 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-vala-4.10.3
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( dev-lang/vala:0.20[vapigen] ) >=xfce-base/exo-0.10 >=xfce-base/garcon-0.2 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfce4-panel-4.10 >=xfce-base/xfconf-4.10
 SLOT=0
 SRC_URI=mirror://xfce/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	98e71281616291d457e8bb8f70e123bf	xfconf	20671cc91311ca7e3446047c1175cf16
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	vala	28e26c72b0f5257aa135444ffc6730b5	xfconf	20671cc91311ca7e3446047c1175cf16
 _md5_=9ca84f7b88c8e5e6e2de6fd63c2f3312
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b2fb5442e502..b690d22b5e3a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Nov 2014 06:07:04 +0000
+Tue, 11 Nov 2014 12:07:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fe44ae3fb615..6a9a5b57d8c3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Nov 11 06:07:01 UTC 2014
+Tue Nov 11 12:07:04 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e366197563ea..0dfb969b8ea5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Nov 2014 06:30:01 +0000
+Tue, 11 Nov 2014 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ae43bcee9b60..e665094a77bb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1415685901 Tue 11 Nov 2014 06:05:01 AM UTC UTC
+1415707501 Tue 11 Nov 2014 12:05:01 PM UTC UTC
diff --git a/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild
index d301da37d460..db137b7d6d56 100644
--- a/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild,v 1.1 2014/11/06 21:43:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1-r1.ebuild,v 1.2 2014/11/11 10:21:06 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qt4-r2 user
@@ -44,12 +44,12 @@ CDEPEND="
 	portaudio? ( media-libs/portaudio )
 	qt4? (
 		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+		dev-qt/qtgui:4[accessibility]
 		x11-misc/xdg-utils
 		)
 	qt5? (
 		dev-qt/qtcore:5
-		dev-qt/qtgui:5
+		dev-qt/qtgui:5[accessibility]
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		x11-misc/xdg-utils
diff --git a/net-analyzer/wireshark/wireshark-1.12.1.ebuild b/net-analyzer/wireshark/wireshark-1.12.1.ebuild
index 61707febdd96..da70d4ec6f77 100644
--- a/net-analyzer/wireshark/wireshark-1.12.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild,v 1.13 2014/11/02 12:09:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.12.1.ebuild,v 1.14 2014/11/11 10:21:06 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps qt4-r2 user
@@ -43,7 +43,7 @@ CDEPEND="
 	portaudio? ( media-libs/portaudio )
 	qt4? (
 		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+		dev-qt/qtgui:4[accessibility]
 		x11-misc/xdg-utils
 		)
 	smi? ( net-libs/libsmi )
diff --git a/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild b/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild
index 1c1e33cb84d8..04d3ff9baebf 100644
--- a/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild,v 1.3 2014/11/02 12:09:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.99.0-r1.ebuild,v 1.4 2014/11/11 10:21:06 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps multilib qt4-r2 user
@@ -44,12 +44,12 @@ CDEPEND="
 	portaudio? ( media-libs/portaudio )
 	qt4? (
 		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+		dev-qt/qtgui:4[accessibility]
 		x11-misc/xdg-utils
 		)
 	qt5? (
 		dev-qt/qtcore:5
-		dev-qt/qtgui:5
+		dev-qt/qtgui:5[accessibility]
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		x11-misc/xdg-utils
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 61ac73f5f386..59e9ef779402 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.2 2014/11/02 12:09:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-99999999.ebuild,v 1.3 2014/11/11 10:21:06 jer Exp $
 
 EAPI=5
 inherit autotools eutils fcaps git-r3 multilib qt4-r2 user
@@ -44,12 +44,12 @@ CDEPEND="
 	portaudio? ( media-libs/portaudio )
 	qt4? (
 		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+		dev-qt/qtgui:4[accessibility]
 		x11-misc/xdg-utils
 		)
 	qt5? (
 		dev-qt/qtcore:5
-		dev-qt/qtgui:5
+		dev-qt/qtgui:5[accessibility]
 		dev-qt/qtprintsupport:5
 		dev-qt/qtwidgets:5
 		x11-misc/xdg-utils
diff --git a/net-dns/c-ares/c-ares-1.10.0-r1.ebuild b/net-dns/c-ares/c-ares-1.10.0-r1.ebuild
index 28150532c62f..6b4eccb8c1ef 100644
--- a/net-dns/c-ares/c-ares-1.10.0-r1.ebuild
+++ b/net-dns/c-ares/c-ares-1.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.10.0-r1.ebuild,v 1.7 2014/10/15 11:00:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/c-ares/c-ares-1.10.0-r1.ebuild,v 1.9 2014/11/11 08:35:49 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES NEWS README RELEASE-NOTES TODO )
diff --git a/net-dns/dnsmasq/dnsmasq-2.72.ebuild b/net-dns/dnsmasq/dnsmasq-2.72.ebuild
index 7634f27bc1e7..179dd30622e0 100644
--- a/net-dns/dnsmasq/dnsmasq-2.72.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72.ebuild,v 1.7 2014/11/10 10:55:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72.ebuild,v 1.8 2014/11/11 10:46:59 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
 for dm_lingua in ${DM_LINGUAS}; do
diff --git a/net-fs/libnfs/libnfs-1.9.5.ebuild b/net-fs/libnfs/libnfs-1.9.5.ebuild
index 6ba907748185..842759725d41 100644
--- a/net-fs/libnfs/libnfs-1.9.5.ebuild
+++ b/net-fs/libnfs/libnfs-1.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-1.9.5.ebuild,v 1.4 2014/10/20 09:27:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-1.9.5.ebuild,v 1.5 2014/11/11 11:26:16 blueness 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 x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 	inherit autotools-utils
 fi
 
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 303dbb3f9af8..5c6662e3afe9 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.6 2014/08/08 14:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-9999.ebuild,v 1.7 2014/11/11 11:26:16 blueness 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="~arm ~amd64 ~x86"
+	KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
 	inherit autotools-utils
 fi
 
diff --git a/net-libs/neon/neon-0.30.0-r1.ebuild b/net-libs/neon/neon-0.30.0-r1.ebuild
index 622fcce804be..034d2e263a9e 100644
--- a/net-libs/neon/neon-0.30.0-r1.ebuild
+++ b/net-libs/neon/neon-0.30.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.30.0-r1.ebuild,v 1.10 2014/11/02 08:51:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/neon/neon-0.30.0-r1.ebuild,v 1.11 2014/11/11 10:44:24 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.webdav.org/neon/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/27"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
 for lingua in ${IUSE_LINGUAS}; do
diff --git a/net-libs/serf/serf-1.3.8.ebuild b/net-libs/serf/serf-1.3.8.ebuild
index fb6c016e2701..6b6caaba4ed7 100644
--- a/net-libs/serf/serf-1.3.8.ebuild
+++ b/net-libs/serf/serf-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.3.8.ebuild,v 1.8 2014/11/10 13:51:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.3.8.ebuild,v 1.9 2014/11/11 10:37:09 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="https://serf.googlecode.com/svn/src_releases/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="kerberos"
 
 RDEPEND="dev-libs/apr:1=
diff --git a/net-mail/notmuch/notmuch-0.18.2.ebuild b/net-mail/notmuch/notmuch-0.18.2.ebuild
index 4789811d237b..bb3712b04582 100644
--- a/net-mail/notmuch/notmuch-0.18.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.2.ebuild,v 1.1 2014/11/01 17:56:21 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.2.ebuild,v 1.2 2014/11/11 11:32:28 nimiux Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( crypt emacs python )
diff --git a/net-misc/curl/curl-7.39.0.ebuild b/net-misc/curl/curl-7.39.0.ebuild
index 726bb47b2677..5e457ce0cce1 100644
--- a/net-misc/curl/curl-7.39.0.ebuild
+++ b/net-misc/curl/curl-7.39.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.39.0.ebuild,v 1.1 2014/11/11 00:10:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.39.0.ebuild,v 1.5 2014/11/11 11:39:00 jer Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 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 ~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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns idn ipv6 kerberos ldap metalink rtmp ssh ssl static-libs test threads"
 IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE="${IUSE} elibc_Winnt"
diff --git a/net-nds/ypbind/ypbind-1.37.2.ebuild b/net-nds/ypbind/ypbind-1.37.2.ebuild
index 065dc72d6d23..60aa5eb7d1d1 100644
--- a/net-nds/ypbind/ypbind-1.37.2.ebuild
+++ b/net-nds/ypbind/ypbind-1.37.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ypbind-1.37.2.ebuild,v 1.8 2014/11/04 09:21:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypbind/ypbind-1.37.2.ebuild,v 1.9 2014/11/11 10:49:32 ago Exp $
 
 EAPI=5
 inherit readme.gentoo systemd
@@ -14,7 +14,7 @@ SRC_URI="http://www.linux-nis.org/download/ypbind-mt/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="debug dbus nls slp systemd"
 
 RDEPEND="
diff --git a/net-news/rawdog/rawdog-2.19.ebuild b/net-news/rawdog/rawdog-2.19.ebuild
index c16450217fef..76c9aa4c5481 100644
--- a/net-news/rawdog/rawdog-2.19.ebuild
+++ b/net-news/rawdog/rawdog-2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/rawdog/rawdog-2.19.ebuild,v 1.9 2014/11/04 09:21:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/rawdog/rawdog-2.19.ebuild,v 1.10 2014/11/11 10:50:45 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 pypy )
@@ -13,7 +13,7 @@ SRC_URI="http://offog.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ~s390 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 77f03fcf3727..9539ffa9a4ca 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -1,3 +1,4 @@
 DIST squid-3.3.13.tar.xz 2187728 SHA256 55d5875709b93f447788526527496956c508832abd1f9c651346e461c9d63221 SHA512 be7ec0ff949f94a4521c6aba2cff87b495ca626c85df5a9650e587c5723f2e52de68e939d8dfed7e8279be7a987c13a773d4f94864308d98d2a67c462b3b2862 WHIRLPOOL faaa5626a97589e486650fa7ff0231487fae65cf7d2ae962f36c7857c97d481c1f82cfd3326bfd0b690543abc01e5581feeaaccd77a8c34ea762abd1ec401f36
 DIST squid-3.4.8.tar.xz 2159904 SHA256 9146017d0e4ad48fbc1d1b6c03d544227c8e7fc7720952b588b688e65beedc18 SHA512 bb965847469be73575ae26b8221b768aa36c9b4e43b0e0ce1722e4cc8c48b683402c06ef4abd655239bab497dfb07658977d32b0d005535ac3dc1aa03ec46689 WHIRLPOOL 505514fc9c286242d565e95778e13bf9647360760f3906bed403763d78759b69a15e587783dba5ecc7ab7ffa26479b904cc54123f5920ae7cf3e07a5800ebc68
 DIST squid-3.4.9.tar.xz 2160416 SHA256 0a0f13bc745437e78df14c31828d9324979b1f2f940b9ce8c9d5bbb7d5fcaa7c SHA512 d9bcb3132723244113a501de02d77430be011c4a0a4c6d96d71f9cc2667c992ccb17723bcc9a9b1e5dedaa4b07bd4d5a5bc491f581bb4fb0e3ecb067a0fd0e1f WHIRLPOOL 8c9942d7b8dd95d8f84378c86cc2c5c887a5bb34a140917e267e8506c2d3735a4d255db9152e5fcbee1fc940df7c5c931897ea59ae1cbe92ef701b2770e9ab84
+DIST squid-3.5.0.2.tar.xz 2282452 SHA256 cf2641212ba705e0953bb95fc01d29b8a63fb3af936a4e0636429b4c339b6c32 SHA512 d07103b021eb71b0f4e6292404fd8d18e8dd7e60e3d6245015345780359512b5c2be74510a80797451c22a4b56275de86aa4b27ceb32176779c1452e5b9efafc WHIRLPOOL c1c65926cd2c81fc4606924daab829d078c6c5e989a248fc24570a47aa9d12fd69df45bf9d246becd5a3637efd0c84b0713d96639ed3c9579894c58c47914812
diff --git a/net-proxy/squid/squid-3.5.0.2.ebuild b/net-proxy/squid/squid-3.5.0.2.ebuild
new file mode 100644
index 000000000000..7e318e67cf22
--- /dev/null
+++ b/net-proxy/squid/squid-3.5.0.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.5.0.2.ebuild,v 1.1 2014/11/11 09:55:06 eras Exp $
+
+EAPI=5
+inherit autotools eutils linux-info pam toolchain-funcs user versionator
+
+DESCRIPTION="A full-featured web proxy cache"
+HOMEPAGE="http://www.squid-cache.org/"
+SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
+	ecap esi ssl-crtd \
+	mysql postgres sqlite \
+	qos tproxy \
+	+htcp +wccp +wccpv2 \
+	pf-transparent ipf-transparent kqueue \
+	elibc_uclibc kernel_linux"
+
+COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
+	pam? ( virtual/pam )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	qos? ( net-libs/libnetfilter_conntrack )
+	ssl? ( dev-libs/openssl dev-libs/nettle net-libs/gnutls )
+	sasl? ( dev-libs/cyrus-sasl )
+	ecap? ( net-libs/libecap:1 )
+	esi? ( dev-libs/expat dev-libs/libxml2 )
+	!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
+	>=sys-libs/db-4
+	dev-lang/perl
+	sys-devel/libtool"
+DEPEND="${COMMON_DEPEND}
+	ecap? ( virtual/pkgconfig )
+	sys-apps/ed
+	test? ( dev-util/cppunit )"
+RDEPEND="${COMMON_DEPEND}
+	samba? ( net-fs/samba )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	selinux? ( sec-policy/selinux-squid )
+	sqlite? ( dev-perl/DBD-SQLite )
+	!<=sci-biology/meme-4.8.1-r1"
+
+REQUIRED_USE="tproxy? ( caps )
+			qos? ( caps )"
+
+pkg_pretend() {
+	if use tproxy; then
+		local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	enewgroup squid 31
+	enewuser squid 31 -1 /var/cache/squid squid
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.3.4-gentoo.patch"
+	sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \
+		INSTALL QUICKSTART \
+		helpers/basic_auth/MSNT/README.html \
+		helpers/basic_auth/MSNT/confload.cc \
+		helpers/basic_auth/MSNT/msntauth.conf.default \
+		scripts/fileno-to-pathname.pl \
+		scripts/check_cache.pl \
+		tools/cachemgr.cgi.8 \
+		tools/purge/conffile.hh \
+		tools/purge/README  || die
+	sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \
+		INSTALL QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \
+		QUICKSTART || die
+	sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \
+		QUICKSTART \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \
+		src/log/access_log.cc || die
+	sed -i -e 's:/usr/local/squid/bin:/usr/bin:' \
+		helpers/basic_auth/MSNT/README.html || die
+	sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \
+		helpers/external_acl/unix_group/ext_unix_group_acl.8 \
+		helpers/external_acl/session/ext_session_acl.8 \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \
+		scripts/check_cache.pl || die
+	sed -i -e 's:/usr/local/squid/ssl_cert:/etc/ssl/squid:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/usr/local/squid/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	sed -i -e 's:/var/lib/ssl_db:/var/lib/squid/ssl_db:' \
+		src/ssl/ssl_crtd.8 || die
+	# /var/run/squid to /run/squid
+	sed -i -e 's:$(localstatedir)::' \
+		src/ipc/Makefile.am || die
+	sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \
+		libltdl/configure.ac || die
+
+	epatch_user
+
+	# Bug #419685 - eautoreconf in src_prepare() fails in libltdl/
+	#               aclocal-1.11: `configure.ac' or `configure.in' is required
+	MAKEOPTS="${MAKEOPTS} -j1" eautoreconf
+}
+
+src_configure() {
+	local basic_modules="MSNT,MSNT-multi-domain,NCSA,POP3,getpwnam"
+	use samba && basic_modules+=",SMB"
+	use ldap && basic_modules+=",LDAP"
+	use pam && basic_modules+=",PAM"
+	use sasl && basic_modules+=",SASL"
+	use nis && ! use elibc_uclibc && basic_modules+=",NIS"
+	use radius && basic_modules+=",RADIUS"
+	if use mysql || use postgres || use sqlite ; then
+		basic_modules+=",DB"
+	fi
+
+	local digest_modules="file"
+	use ldap && digest_modules+=",LDAP,eDirectory"
+
+	local negotiate_modules="none"
+	local myconf="--without-mit-krb5 --without-heimdal-krb5"
+	if use kerberos ; then
+		negotiate_modules="kerberos,wrapper"
+		if has_version app-crypt/heimdal ; then
+			myconf="--without-mit-krb5 --with-heimdal-krb5"
+		else
+			myconf="--with-mit-krb5 --without-heimdal-krb5"
+		fi
+	fi
+
+	local ntlm_modules="none"
+	use samba && ntlm_modules="smb_lm"
+
+	local ext_helpers="file_userip,session,unix_group"
+	use samba && ext_helpers+=",wbinfo_group"
+	use ldap && ext_helpers+=",LDAP_group,eDirectory_userip"
+	use ldap && use kerberos && ext_helpers+=",kerberos_ldap_group"
+
+	local storeio_modules="aufs,diskd,rock,ufs"
+
+	local transparent
+	if use kernel_linux ; then
+		transparent+=" --enable-linux-netfilter"
+		use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack"
+	fi
+
+	if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then
+		transparent+=" $(use_enable kqueue)"
+		if use pf-transparent; then
+			transparent+=" --enable-pf-transparent"
+		elif use ipf-transparent; then
+			transparent+=" --enable-ipf-transparent"
+		fi
+	fi
+
+	tc-export CC AR
+
+	econf \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/libexec/squid \
+		--localstatedir=/var \
+		--with-pidfile=/run/squid.pid \
+		--datadir=/usr/share/squid \
+		--with-logdir=/var/log/squid \
+		--with-default-user=squid \
+		--enable-removal-policies="lru,heap" \
+		--enable-storeio="${storeio_modules}" \
+		--enable-disk-io \
+		--enable-auth \
+		--enable-auth-basic="${basic_modules}" \
+		--enable-auth-digest="${digest_modules}" \
+		--enable-auth-ntlm="${ntlm_modules}" \
+		--enable-auth-negotiate="${negotiate_modules}" \
+		--enable-external-acl-helpers="${ext_helpers}" \
+		--enable-log-daemon-helpers \
+		--enable-url-rewrite-helpers \
+		--enable-cache-digests \
+		--enable-delay-pools \
+		--enable-eui \
+		--enable-icmp \
+		--enable-follow-x-forwarded-for \
+		--with-large-files \
+		--disable-strict-error-checking \
+		--disable-arch-native \
+		$(use_with caps libcap) \
+		$(use_enable ipv6) \
+		$(use_enable snmp) \
+		$(use_with ssl openssl) \
+		$(use_with ssl nettle) \
+		$(use_with ssl gnutls) \
+		$(use_enable ssl-crtd) \
+		$(use_enable ecap) \
+		$(use_enable esi) \
+		$(use_enable htcp) \
+		$(use_enable wccp) \
+		$(use_enable wccpv2) \
+		${transparent} \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# need suid root for looking into /etc/shadow
+	fowners root:squid /usr/libexec/squid/basic_ncsa_auth
+	fperms 4750 /usr/libexec/squid/basic_ncsa_auth
+	if use pam; then
+		fowners root:squid /usr/libexec/squid/basic_pam_auth
+		fperms 4750 /usr/libexec/squid/basic_pam_auth
+	fi
+	# pinger needs suid as well
+	fowners root:squid /usr/libexec/squid/pinger
+	fperms 4750 /usr/libexec/squid/pinger
+
+	# cleanup
+	rm -f "${D}"/usr/bin/Run*
+	rm -rf "${D}"/run/squid "${D}"/var/cache/squid
+
+	dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt
+	newdoc helpers/negotiate_auth/kerberos/README README.kerberos
+	newdoc helpers/basic_auth/MSNT-multi-domain/README.txt README.MSNT-multi-domain
+	newdoc helpers/basic_auth/LDAP/README README.LDAP
+	newdoc helpers/basic_auth/RADIUS/README README.RADIUS
+	newdoc helpers/external_acl/kerberos_ldap_group/README README.kerberos_ldap_group
+	newdoc tools/purge/README README.purge
+	newdoc tools/helper-mux.README README.helper-mux
+	dohtml RELEASENOTES.html
+
+	newpamd "${FILESDIR}/squid.pam" squid
+	newconfd "${FILESDIR}/squid.confd-r1" squid
+	newinitd "${FILESDIR}/squid.initd-r4" squid
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/squid.logrotate" squid
+	else
+		exeinto /etc/cron.weekly
+		newexe "${FILESDIR}/squid.cron" squid.cron
+	fi
+
+	diropts -m0750 -o squid -g squid
+	keepdir /var/log/squid /etc/ssl/squid /var/lib/squid
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 1 ${REPLACING_VERSIONS}) -lt 3 ]] || \
+		[[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 5 ]]; then
+		elog "Please read the release notes at:"
+		elog "  http://www.squid-cache.org/Versions/v3/3.5/RELEASENOTES.html"
+		echo
+	fi
+}
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 06f24a5b39f2..67d755de5cd1 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.167 2014/10/30 08:37:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.168 2014/11/11 11:17:14 pacho Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2014)
+# Missing keywords, bug #523686
+>=dev-libs/libgdata-0.16.1 test
 
 # Michał Górny <mgorny@gentoo.org> (30 Oct 2014)
 # Requires non-keyworded >=x11-libs/libxkbcommon-0.4.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 742475f9d4ea..7e83c237e9de 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.150 2014/10/30 08:40:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.151 2014/11/11 11:17:14 pacho Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2014)
+# Missing keywords, bug #523686
+>=dev-libs/libgdata-0.16.1 test
 
 # Michał Górny <mgorny@gentoo.org> (30 Oct 2014)
 # Requires non-keyworded >=x11-libs/libxkbcommon-0.4.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 2a02f9c45ece..748e0938ef35 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.174 2014/10/30 08:43:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/package.use.mask,v 1.175 2014/11/11 11:17:14 pacho Exp $
+
+# Pacho Ramos <pacho@gentoo.org> (11 Nov 2014)
+# Missing keywords, bug #523686
+>=dev-libs/libgdata-0.16.1 test
 
 # Michał Górny <mgorny@gentoo.org> (30 Oct 2014)
 # Requires non-keyworded >=x11-libs/libxkbcommon-0.4.
diff --git a/profiles/package.mask b/profiles/package.mask
index 3fee9f8217dc..882543963242 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16155 2014/11/10 23:07:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16156 2014/11/11 09:53:51 eras 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,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Eray Aslan <eras@gentoo.org> (11 Nov 2014)
+# Mask beta releases
+=net-proxy/squid-3.5*
+
 # Andreas K. Huettel <dilfridge@gentoo.org> (11 Nov 2014)
 # Mask for an initial testing period
 =app-text/poppler-0.28*
diff --git a/sys-apps/rng-tools/rng-tools-4-r7.ebuild b/sys-apps/rng-tools/rng-tools-4-r7.ebuild
index 28644508512e..2c9f151831fd 100644
--- a/sys-apps/rng-tools/rng-tools-4-r7.ebuild
+++ b/sys-apps/rng-tools/rng-tools-4-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-4-r7.ebuild,v 1.6 2014/11/03 09:35:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-4-r7.ebuild,v 1.7 2014/11/11 10:46:06 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc x86"
+KEYWORDS="alpha amd64 ia64 ppc x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-rngd )"
diff --git a/sys-apps/smartmontools/smartmontools-6.3.ebuild b/sys-apps/smartmontools/smartmontools-6.3.ebuild
index 0c27bbd13aff..d296bb952b4e 100644
--- a/sys-apps/smartmontools/smartmontools-6.3.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.3.ebuild,v 1.10 2014/11/10 10:53:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-6.3.ebuild,v 1.11 2014/11/11 10:44:45 ago Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools"
diff --git a/sys-auth/polkit/polkit-0.112-r2.ebuild b/sys-auth/polkit/polkit-0.112-r2.ebuild
index d86ceac16c25..5a5193feb928 100644
--- a/sys-auth/polkit/polkit-0.112-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.14 2014/11/06 10:57:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.15 2014/11/11 10:48:13 ago Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="examples gtk +introspection jit kde nls pam selinux systemd"
 
 CDEPEND="
diff --git a/sys-block/parted/parted-3.2.ebuild b/sys-block/parted/parted-3.2.ebuild
index 2e6ae794f732..6a4d3028bf98 100644
--- a/sys-block/parted/parted-3.2.ebuild
+++ b/sys-block/parted/parted-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.8 2014/11/10 10:55:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.9 2014/11/11 10:49:14 ago Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="+debug device-mapper nls readline selinux static-libs"
 RESTRICT="test"
 
diff --git a/sys-devel/gdb/gdb-7.7.1.ebuild b/sys-devel/gdb/gdb-7.7.1.ebuild
index 913dd3930d40..41e20c32b8bf 100644
--- a/sys-devel/gdb/gdb-7.7.1.ebuild
+++ b/sys-devel/gdb/gdb-7.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.1.ebuild,v 1.10 2014/11/04 20:15:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.1.ebuild,v 1.11 2014/11/11 10:52:58 ago Exp $
 
 EAPI="4"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -51,7 +51,7 @@ SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.x
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild
index 04be3f7b5f52..415107198b55 100644
--- a/sys-devel/make/make-4.0-r1.ebuild
+++ b/sys-devel/make/make-4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-4.0-r1.ebuild,v 1.10 2014/11/10 10:52:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-4.0-r1.ebuild,v 1.11 2014/11/11 10:46:41 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 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"
+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="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8 )"
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.1.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.1.ebuild
index 1efa0e5deea8..6b92cd8835a7 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.2.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.2.1.ebuild,v 1.9 2014/11/04 09:20:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.2.1.ebuild,v 1.10 2014/11/11 10:46:24 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"
 
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index a08d422b6345..65b16dce4aea 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -1,10 +1,17 @@
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
+DIST deblob-3.12 120320 SHA256 1d767acd3f461bcaa7ebef744dce1ca3eefde1cd41fde4c69a449e2470ab8c0e SHA512 61073cb763e3e0c21a84c0ee888087fbbf37b667ce0efbbc6c2ebc46ccae8460553511e347cf23d3c3603eec64df738ad4552a1b527453c7d795b8f90c4cf678 WHIRLPOOL c64cc566944ac241149a2a517da069185830be5b8ee25168b2b6b942bcf24fe3f2c0fe487b51a5b7e73e2910af2cabd7167cd1497ab7272c865d1eb3e68e4efe
 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 DIST deblob-check-3.10 565672 SHA256 748df2cf5c1f012f9942948827e57b12bb05c569cae220416b3c0339520d9855 SHA512 341ea8a755c4f1f42ddbc4e7dfe8d786e8b29f497bee3fd72154c8c1c0bcadcb9efff04f2663090bd8741e5b5baafed26a62b9d16c31f3b31665cd3cd3e779d5 WHIRLPOOL 7e6c8eefa9b44e7d50011a9390baf7999533b4016122992c0ac0722cce05dbb8e4b7e96f1f05e9bfdd2ce3e4c08f0e06c8955b68ed8c044ff75f3a314a405824
+DIST deblob-check-3.12 601108 SHA256 e6c07b4220f86007ea31f9ed5d01023253296ddaa0710e65e08f231eccf6085a SHA512 fb293fb5093c410b319203cf0a65457a3ef28430ad6257b08a6e3eb77011d79708c51121c0a8776f55124259719782b4ac9b4c54155c13bb05a2679541816887 WHIRLPOOL e056b4edccd36911fe415cd1780bb484875a16237dce89316144c8ee07df3253bc19abdbee2e51ab3dd9248682470e80409819584c188e22601026e8df222754
 DIST deblob-check-3.14 613747 SHA256 e1d5ced14e38fd415eb5a9a50e180cfdc63b2d0f0350a6d36645b82ef0351304 SHA512 f5901a7c41db34ea3c29e6c6f6fa1afacf4edca1cfad901599b982fd66b5ce3894aa9075b5d15b7a8a6c9694833752fb609d98889b5de39ab59aea7d024a740b WHIRLPOOL 5064bf7423a4703a976b4342da5b3cef65584ee701462e261398170b3e5189036327e114deb15a29ded79541dbe084fa86b08b8c293d4585614ac09f791d7f60
 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
 DIST patch-3.10.6-rt3.patch.xz 140584 SHA256 b3c8f3757e4a0b4010e3d3320358dc04b873881dcaef8330bffd133c51815b09 SHA512 63097ab7ff11b5b795fd4398101f207baf71c8d5a1930d9c8e89b2c0864e0fed7d57874d7fb614618f68a4685acb6f9317ca13f74446c9a868c1327d518f0285 WHIRLPOOL d60c61f244ed9762427b3b0970b334437fb601a07faf77a54c4d016c0b27b7098cf1b57bcbbcc0940b32007f337294d80d1a7c45d4ce7b1e31e0047649e778c6
 DIST patch-3.10.6.xz 151356 SHA256 e17be1ccd6b904d70e3be2b61c16bd4346272c86b5ee1a12ab8d80dcdc7b1487 SHA512 9e0cc15f3613fc523f3a58a3eaca4aa135aaea2abfc4ba50db4923bb470d41e4f49192b967c9c489e81d0764f6712e9217b026e4e5f1472cf644bf0bcbe438fa WHIRLPOOL 7779ab4dbb4a39b04eeee70ac93ad03b5a8a76aaef49038e30f523f628bda71b54dfcf18b8a1241b333a5619acce33cdcdf10edbf4521061f37d7c9e6084361d
+DIST patch-3.12.31-rt45.patch.xz 149656 SHA256 7a4b33ff0a97d4ae36a5ae316976b8fc66748d448a944e621e6f165e709a565b SHA512 4a4e68c29708203beef99f58e6c8c72025981ec8bf9b5d37eac76a81841a8e4b4343e111e0f73a0e23ce4c695f64297c4d56e1837de03d6c05bf0e4a3438c677 WHIRLPOOL 247a3c03f701570a6466891cf8519bdbc62bbeb90c1df52923dcc38fcfe177c2d04068a35155583dfb9a78890ee8763751a6238ea338c6f1a87c714f59196388
+DIST patch-3.12.31.xz 884244 SHA256 674c03ebc521b430ca468994454c3afcd9d24ee87b8fe17f73c227f3efb3fe29 SHA512 fd83407c49d72c7656f39ab17e2e7b85c08593be1316decbfe1939895ab2a37149a97265102cba65e47a2d6b7012096449ab954196781187e680ff91a94f3c5e WHIRLPOOL 6049af7a773548d583e2e424eae18d4c2ed2ca2d7f30a6d5ced36b4c843f3742caeb348b73fa991e971ba4ed703a49fb982bb28e7c69c1f13a16f9cec033a806
 DIST patch-3.14.12-rt9.patch.xz 138436 SHA256 aedc16bf897b0a1b0789158afad9ffed92be30eaedf8fe2f27cad659673dc93e SHA512 99c2d460863af6c5fbd39c953e7afdb6ed0af403d097c5ea74f9101be867a42f348e2f59db5cbf3a0c01f7b4e25c75e6bb349f940c80a492632d5630de810a23 WHIRLPOOL 47148973b1051f7a4e8b7313db21830dc52a6fe1cb4fa7e441e2eff18cb3e270c8a671fdc7f59ea92a947a85bae2e71e4291c332fdbe3f63e184814129fd5500
 DIST patch-3.14.12.xz 324672 SHA256 b50d9569bc2e47f3be996fdbcb043e7eace9c92cbcb77d825dd1493f2d399475 SHA512 d5be9e74c530f1b48fd7fb38c91d375fe60c1d71e165b0cd7a39f49e7b79c0261c8170607e6fd67ef154273601fb5a8f078ee6deb1f973c180e39762634126bf WHIRLPOOL 15e2de869ead61583fa5c8509d07e2377dbfe9c7bf66ad5198d97cbb2008ef8f20c636664b3e345285f5948ce98fe26a5f292adc51af22ba903a508556b55c28
+DIST patch-3.14.23-rt20.patch.xz 146620 SHA256 cbce51ec97892068679f62b10871fca609617905bc0c029be7bdae78db80a800 SHA512 b4f4e1b7f91f075718dca7eaf7953971f3704f736adaf35ccaf4b5e657efb4615a13fb5f9858ae320d3f75ed49ca10d6c6eeed89396619abc9cbbba62bef3ef8 WHIRLPOOL 3a1466f38af9895abd17e8cf22e406aee83d49d504030be39ca93bd1a17faa732c3b70ca9d31f6e2c99bb0587a9c5cd1a525a4b893789d5dc2b43e8ea64bb735
+DIST patch-3.14.23.xz 558604 SHA256 451199487f3e311ff57729f9104c23eeab1db528f15f2091da74cb2fd565f56e SHA512 31883f947d93e8b489f75d3508efab24f3d5c94f75f6f0e66e34ad8f54de2511eb22e92b8a27bde19bba3c1a510435f3ba181157bdef726120226eba18bd825a WHIRLPOOL 4c7540f777f1e6c591fdad078380650f9a5ac52db773898f9f2a255030156abf2e44b95585ef8e4cedf66c2094bb241a9288cef9c1e313183195d84e7ec41cc1
diff --git a/sys-kernel/rt-sources/rt-sources-3.12.31_p45.ebuild b/sys-kernel/rt-sources/rt-sources-3.12.31_p45.ebuild
new file mode 100644
index 000000000000..299426215a99
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.12.31_p45.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/rt-sources-3.12.31_p45.ebuild,v 1.1 2014/11/11 11:47:14 psomas Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_postinst(){
+
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-kernel/rt-sources/rt-sources-3.14.23_p20.ebuild b/sys-kernel/rt-sources/rt-sources-3.14.23_p20.ebuild
new file mode 100644
index 000000000000..784005c1ba42
--- /dev/null
+++ b/sys-kernel/rt-sources/rt-sources-3.14.23_p20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rt-sources/rt-sources-3.14.23_p20.ebuild,v 1.1 2014/11/11 11:47:14 psomas Exp $
+
+EAPI="5"
+ETYPE="sources"
+KEYWORDS="~amd64"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/projects/rt/"
+
+inherit versionator
+
+CKV="$(get_version_component_range 1-3)"
+K_SECURITY_UNSUPPORTED="yes"
+K_DEBLOB_AVAILABLE="1"
+RT_PATCHSET="${PV/*_p}"
+
+inherit kernel-2
+detect_version
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+RT_FILE="patch-${K_BRANCH_ID}.${KV_PATCH}-rt${RT_PATCHSET}.patch.xz"
+RT_URI="mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/${RT_FILE} \
+		mirror://kernel/linux/kernel/projects/rt/${K_BRANCH_ID}/older/${RT_FILE}"
+
+DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with the CONFIG_PREEMPT_RT patch"
+SRC_URI="${KERNEL_URI} ${RT_URI}"
+
+KV_FULL="${PVR/_p/-rt}"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+UNIPATCH_LIST="${DISTDIR}/${RT_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_postinst(){
+
+	ewarn
+	ewarn "${PN} are *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the RT project developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds."
+	ewarn
+}
+
+K_EXTRAEINFO="For more info on rt-sources and details on how to report problems, see: \
+${HOMEPAGE}."
diff --git a/sys-process/htop/htop-1.0.3.ebuild b/sys-process/htop/htop-1.0.3.ebuild
index 7203d74cfe67..dffbb06ab87f 100644
--- a/sys-process/htop/htop-1.0.3.ebuild
+++ b/sys-process/htop/htop-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.3.ebuild,v 1.9 2014/11/04 09:22:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.3.ebuild,v 1.10 2014/11/11 10:53:34 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses[unicode?]"
diff --git a/www-client/lynx/lynx-2.8.8_p2.ebuild b/www-client/lynx/lynx-2.8.8_p2.ebuild
index bdc22f89bf88..b8581bf2a2cd 100644
--- a/www-client/lynx/lynx-2.8.8_p2.ebuild
+++ b/www-client/lynx/lynx-2.8.8_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_p2.ebuild,v 1.9 2014/11/04 09:26:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_p2.ebuild,v 1.10 2014/11/11 10:51:23 ago Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
 
 LICENSE="GPL-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 ~ia64-hpux ~x86-interix ~amd64-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 ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
 
 RDEPEND="sys-libs/ncurses[unicode?]
diff --git a/x11-misc/synergy/synergy-1.6.1.ebuild b/x11-misc/synergy/synergy-1.6.1.ebuild
index 437822aeff8b..5d655d133cd7 100644
--- a/x11-misc/synergy/synergy-1.6.1.ebuild
+++ b/x11-misc/synergy/synergy-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.6.1.ebuild,v 1.2 2014/11/08 20:40:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.6.1.ebuild,v 1.3 2014/11/11 11:51:33 jer Exp $
 
 EAPI=5
 inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
@@ -19,7 +19,6 @@ IUSE="qt4 test"
 
 COMMON_DEPEND="
 	>=dev-libs/crypto++-5.6.2
-	net-dns/avahi[mdnsresponder-compat]
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -28,7 +27,11 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXtst
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		net-dns/avahi[mdnsresponder-compat]
+	)
 "
 DEPEND="
 	${COMMON_DEPEND}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.30.ebuild b/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
index 287522db0783..e09364c07510 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.30.ebuild,v 1.10 2014/11/04 09:24:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.30.ebuild,v 1.11 2014/11/11 10:47:20 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib pam
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="